From c651948cb3effbd2960062114f4b93d6507a2fe8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 2 May 2011 23:54:35 -0400
Subject: [ticket/9630] Make language for moving posts clearer in quickmod/mcp.

PHPBB3-9630
---
 phpBB/styles/subsilver2/template/mcp_topic.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html
index 12c0f73b97..13865d26ee 100644
--- a/phpBB/styles/subsilver2/template/mcp_topic.html
+++ b/phpBB/styles/subsilver2/template/mcp_topic.html
@@ -35,7 +35,7 @@
 
 <!-- IF S_CAN_MERGE -->
 	<tr>
-		<th colspan="3" nowrap="nowrap">{L_MERGE_TOPIC}</th>
+		<th colspan="3" nowrap="nowrap">{L_MERGE_POSTS}</th>
 	</tr>
 	<tr>
 		<td class="row2" colspan="3" align="center"><span class="gensmall">{L_MERGE_TOPIC_EXPLAIN}</span></td>
-- 
cgit v1.2.1


From 963a67332af12af31d231baf315fdd29d30149cb Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 7 Mar 2011 02:05:37 +0100
Subject: [ticket/9922] Link post subject to the post's anchor in subsilver2.

Link post subject to the post's anchor in subsilver2 to expose full URL to post
which is otherwise only hidden behind the small post icon.

PHPBB3-9922
---
 phpBB/styles/subsilver2/template/viewtopic_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index bba00ce685..630871af61 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -150,7 +150,7 @@
 				<!-- IF postrow.POST_ICON_IMG -->
 					<td><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" title="" /></td>
 				<!-- ENDIF -->
-					<td class="gensmall" width="100%"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<b>{L_POST_SUBJECT}:</b> {postrow.POST_SUBJECT}</div><div style="float: {S_CONTENT_FLOW_END};"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><b>{L_POSTED}:</b> {postrow.POST_DATE}&nbsp;</div></td>
+					<td class="gensmall" width="100%"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<b>{L_POST_SUBJECT}:</b> <a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></div><div style="float: {S_CONTENT_FLOW_END};"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><b>{L_POSTED}:</b> {postrow.POST_DATE}&nbsp;</div></td>
 				</tr>
 				</table>
 			</td>
-- 
cgit v1.2.1


From 2f458352b8660386021af6868dcec75943bb8483 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 8 May 2011 15:24:03 +0200
Subject: [ticket/10173] Use a loop var for the birthdays list to allow proper
 templating

Introduce a loop variable for the list of birthdays to allow templates to
handle how the list is displayed.

We keep the old BIRTHDAY_LIST variable that contains the precompiled list
around for backward compatibility.

PHPBB3-10173
---
 phpBB/styles/subsilver2/template/index_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index e52e357564..100199c209 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -50,7 +50,7 @@
 	</tr>
 	<tr>
 		<td class="row1" align="center" valign="middle"><img src="{T_THEME_PATH}/images/whosonline.gif" alt="{L_BIRTHDAYS}" /></td>
-		<td class="row1" width="100%"><p class="genmed"><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <b>{BIRTHDAY_LIST}</b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p></td>
+		<td class="row1" width="100%"><p class="genmed"><!-- IF .birthdays -->{L_CONGRATULATIONS}: <b><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p></td>
 	</tr>
 	</table>
 <!-- ENDIF -->
-- 
cgit v1.2.1


From fe425dedff388e5eb1477874e0419114db996dc2 Mon Sep 17 00:00:00 2001
From: Adam Reyher <adamr@phpbb.com>
Date: Thu, 9 Jun 2011 06:52:11 -0400
Subject: [ticket/9878] Remove IE7 emulation from prosilver/subSilver2

With these changes, prosilver and subSilver2 no longer need to force IE7
emulation when browsing with IE8 due to the well-known textarea scrolling
bug.

PHPBB3-9878
---
 phpBB/styles/subsilver2/template/overall_header.html    | 1 -
 phpBB/styles/subsilver2/template/posting_body.html      | 2 +-
 phpBB/styles/subsilver2/template/quickreply_editor.html | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index be4c7b5b4c..62ed79ed39 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -10,7 +10,6 @@
 <meta name="distribution" content="global" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
-<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9" />
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 0021cd2eb3..fec6d7ff6c 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -210,7 +210,7 @@
 		<table width="100%" cellspacing="0" cellpadding="0" border="0">
 		<!-- 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);" onfocus="initInsertions();" style="width: 98%;">{MESSAGE}</textarea></td>
+			<td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" style="width: 700px; height: 270px; min-width: 98%; max-width: 98%;">{MESSAGE}</textarea></td>
 			<!-- IF S_BBCODE_ALLOWED -->
 			<td width="80" align="center" valign="top">
 				<script type="text/javascript">
diff --git a/phpBB/styles/subsilver2/template/quickreply_editor.html b/phpBB/styles/subsilver2/template/quickreply_editor.html
index 704c6e1306..91a8c9a702 100644
--- a/phpBB/styles/subsilver2/template/quickreply_editor.html
+++ b/phpBB/styles/subsilver2/template/quickreply_editor.html
@@ -10,7 +10,7 @@
 		</tr>
 		<tr>
 			<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}:</b></td>
-			<td class="row2" valign="top" align="left" width="78%"><textarea name="message" rows="7" cols="76" tabindex="3"  style="width: 98%;"></textarea> </td>
+			<td class="row2" valign="top" align="left" width="78%"><textarea name="message" rows="7" cols="76" tabindex="3"  style="width: 700px; height: 130px; min-width: 98%; max-width: 98%;"></textarea> </td>
 		</tr>
 		<tr>
 			<td class="cat" colspan="2" align="center">
-- 
cgit v1.2.1


From 5b5ed96bc5097bebf3d1ec0c6af87588a53f4e05 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 9 Jun 2011 09:41:29 +0200
Subject: [ticket/7888] Swap in-forum/topic search to GET forms.

This will allow sending URLs to search results to other users. The advanced
search page has always worked like this, but these special pages used to
cause problems.

PHPBB3-7888
---
 phpBB/styles/subsilver2/template/searchbox.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/searchbox.html b/phpBB/styles/subsilver2/template/searchbox.html
index cb0bb5ba73..09b87a15d8 100644
--- a/phpBB/styles/subsilver2/template/searchbox.html
+++ b/phpBB/styles/subsilver2/template/searchbox.html
@@ -1 +1 @@
-<form method="post" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}:</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" /></form>
+<form method="get" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}:</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" />{S_SEARCH_HIDDEN_FIELDS}</form>
-- 
cgit v1.2.1


From b774520621e5508365984a890e1b9c2375c201c3 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 11 Jun 2011 02:20:48 +0200
Subject: [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9
 releases.

---
 phpBB/styles/subsilver2/imageset/imageset.cfg | 2 +-
 phpBB/styles/subsilver2/style.cfg             | 2 +-
 phpBB/styles/subsilver2/template/template.cfg | 2 +-
 phpBB/styles/subsilver2/theme/theme.cfg       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg
index ce0c859193..d8cfabcb02 100644
--- a/phpBB/styles/subsilver2/imageset/imageset.cfg
+++ b/phpBB/styles/subsilver2/imageset/imageset.cfg
@@ -19,7 +19,7 @@
 # General Information about this style
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.8
+version = 3.0.9
 
 # Images
 img_site_logo = site_logo.gif*94*170
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index b8ddd6deec..0cdb7204bb 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -19,4 +19,4 @@
 # General Information about this style
 name = subsilver2
 copyright = &copy; 2005 phpBB Group
-version = 3.0.8
+version = 3.0.9
diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg
index edfc2d43f2..92ccfef35a 100644
--- a/phpBB/styles/subsilver2/template/template.cfg
+++ b/phpBB/styles/subsilver2/template/template.cfg
@@ -19,5 +19,5 @@
 # General Information about this template
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.8
+version = 3.0.9
 
diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg
index a6ac5f337c..94e2f6d53d 100644
--- a/phpBB/styles/subsilver2/theme/theme.cfg
+++ b/phpBB/styles/subsilver2/theme/theme.cfg
@@ -21,7 +21,7 @@
 # General Information about this theme
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.8
+version = 3.0.9
 
 # Some configuration options
 
-- 
cgit v1.2.1


From 6458a1a16ac3d9935a4933b0de7b6e464b33fce3 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 18 Jun 2011 23:21:45 +0200
Subject: [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to
 S_SEARCH_LOCAL_HIDDEN_FIELDS

Avoids the global hidden fields from functions.php overwriting local
searches.

PHPBB3-10232
---
 phpBB/styles/subsilver2/template/searchbox.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/searchbox.html b/phpBB/styles/subsilver2/template/searchbox.html
index 09b87a15d8..622961c881 100644
--- a/phpBB/styles/subsilver2/template/searchbox.html
+++ b/phpBB/styles/subsilver2/template/searchbox.html
@@ -1 +1 @@
-<form method="get" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}:</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" />{S_SEARCH_HIDDEN_FIELDS}</form>
+<form method="get" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}:</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" />{S_SEARCH_LOCAL_HIDDEN_FIELDS}</form>
-- 
cgit v1.2.1


From a275d17625325e0353b67fabf5a9b0c4fb35877e Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Wed, 6 Jul 2011 20:38:02 -0400
Subject: [ticket/9859] Changing all phpBB footers to match the new credit line

PHPBB3-9859
---
 phpBB/styles/subsilver2/template/overall_footer.html           | 2 +-
 phpBB/styles/subsilver2/template/simple_footer.html            | 2 +-
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 2 +-
 phpBB/styles/subsilver2/template/viewtopic_print.html          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index b53fff9f7f..5d6b63986f 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -3,7 +3,7 @@
 
 <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/">phpBB</a> &copy; phpBB Group
+	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
 </div>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index 1bd146b599..043be16cdb 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -2,7 +2,7 @@
 </div>
 
 <div id="wrapfooter">
-	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group</span>
+	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group</span>
 </div>
 
 </body>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index eff4a2a7dd..6753a5bc33 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -114,7 +114,7 @@ hr.sep {
 	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
 </tr>
 <tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
+	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
 </tr>
 </table>
 
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 38ec10fad8..964c95f677 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -128,7 +128,7 @@ hr.sep {
 	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
 </tr>
 <tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
+	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
 </tr>
 </table>
 
-- 
cgit v1.2.1


From 766537035ea2f04c5aa3c59c15edc15f4ecd050f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 9 Jul 2011 15:28:33 +0200
Subject: [ticket/10258] Change the DOCTYPE to HTML5

PHPBB3-10258
---
 phpBB/styles/subsilver2/template/overall_header.html           | 10 ++++------
 phpBB/styles/subsilver2/template/simple_header.html            | 10 ++++------
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html |  7 +++----
 phpBB/styles/subsilver2/template/viewtopic_print.html          |  7 +++----
 4 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index a27c13624b..df36d86b8d 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -1,10 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-
-<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="content-language" content="{S_USER_LANG}" />
-<meta http-equiv="content-style-type" content="text/css" />
+<meta charset="{S_CONTENT_ENCODING}">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
index 9fcca4eb30..f3ca0b35ed 100644
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ b/phpBB/styles/subsilver2/template/simple_header.html
@@ -1,10 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-
-<meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta http-equiv="content-language" content="{S_USER_LANG}" />
-<meta http-equiv="content-style-type" content="text/css" />
+<meta charset="{S_CONTENT_ENCODING}">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index 6753a5bc33..20d1edd249 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<meta http-equiv="Content-Language" content="{S_USER_LANG}">
+<meta charset="{S_CONTENT_ENCODING}">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <title>{SITENAME} :: {PAGE_TITLE}</title>
 
 <style type="text/css">
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 10bd43fd42..8c27d613fa 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<meta http-equiv="Content-Language" content="{S_USER_LANG}">
+<meta charset="{S_CONTENT_ENCODING}">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <title>{SITENAME} :: {PAGE_TITLE}</title>
 
 <style type="text/css">
-- 
cgit v1.2.1


From 854c14f9f6ae78318e159e27724178579ff48dcc Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 10 Jul 2011 23:04:14 +0200
Subject: [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags

These meta tags are IE specific and do not validate as HTML5.

PHPBB3-10258
---
 phpBB/styles/subsilver2/template/overall_header.html           | 2 --
 phpBB/styles/subsilver2/template/simple_header.html            | 2 --
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 1 -
 phpBB/styles/subsilver2/template/viewtopic_print.html          | 1 -
 4 files changed, 6 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index df36d86b8d..f1881b1310 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -2,8 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="{S_CONTENT_ENCODING}">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
 <meta name="keywords" content="" />
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
index f3ca0b35ed..f8881fa9a0 100644
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ b/phpBB/styles/subsilver2/template/simple_header.html
@@ -2,8 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="{S_CONTENT_ENCODING}">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
 <meta name="keywords" content="" />
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index 20d1edd249..c1faeb2460 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -2,7 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="{S_CONTENT_ENCODING}">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <title>{SITENAME} :: {PAGE_TITLE}</title>
 
 <style type="text/css">
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 8c27d613fa..0deae2427a 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -2,7 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="{S_CONTENT_ENCODING}">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <title>{SITENAME} :: {PAGE_TITLE}</title>
 
 <style type="text/css">
-- 
cgit v1.2.1


From 70a904335f63a7b7d16164aadd48f33cad9ab4f0 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 10 Jul 2011 23:13:25 +0200
Subject: [ticket/10258] Remove resource-type and distribution meta tags

They break HTML5 validation.

PHPBB3-10258
---
 phpBB/styles/subsilver2/template/overall_header.html | 2 --
 phpBB/styles/subsilver2/template/simple_header.html  | 2 --
 2 files changed, 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index f1881b1310..cd6afb0a4d 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -2,8 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="{S_CONTENT_ENCODING}">
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
index f8881fa9a0..37046fd3b5 100644
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ b/phpBB/styles/subsilver2/template/simple_header.html
@@ -2,8 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="{S_CONTENT_ENCODING}">
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
-- 
cgit v1.2.1


From c945fc9355fca866bfb095a2e79c51408a709387 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 11 Jul 2011 09:55:18 +0200
Subject: [ticket/10155] Add jQuery, introduce global assets path

Add the jQuery JavaScript library to all pages, giving modifications
instant access and allowing for any future core JavaScript to take
advantage of it.

Also introduce a global /assets directory for assets that are shared
between styles.

PHPBB3-10155
---
 phpBB/styles/subsilver2/template/overall_header.html | 1 +
 phpBB/styles/subsilver2/template/simple_header.html  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index a27c13624b..4ceebf848c 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -25,6 +25,7 @@
 
 <link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 <!-- IF S_USER_PM_POPUP and S_NEW_PM -->
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
index 9fcca4eb30..d2324e9048 100644
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ b/phpBB/styles/subsilver2/template/simple_header.html
@@ -14,6 +14,7 @@
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
 <link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From 136a932303d7d7a427043d1834b6df40dc219b0e Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 12 Jul 2011 01:32:00 +0200
Subject: [ticket/10258] Remove the meta charset tag

The charset tag is useless, because if a charset content-type header is
present it takes precedence. And phpBB always sends such a header.

PHPBB3-10258
---
 phpBB/styles/subsilver2/template/overall_header.html           | 1 -
 phpBB/styles/subsilver2/template/simple_header.html            | 1 -
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 1 -
 phpBB/styles/subsilver2/template/viewtopic_print.html          | 1 -
 4 files changed, 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index cd6afb0a4d..4d646ac0e7 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta charset="{S_CONTENT_ENCODING}">
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
index 37046fd3b5..c88eea524a 100644
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ b/phpBB/styles/subsilver2/template/simple_header.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta charset="{S_CONTENT_ENCODING}">
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index c1faeb2460..6eb8396dbf 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta charset="{S_CONTENT_ENCODING}">
 <title>{SITENAME} :: {PAGE_TITLE}</title>
 
 <style type="text/css">
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 0deae2427a..c05066aa14 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
-<meta charset="{S_CONTENT_ENCODING}">
 <title>{SITENAME} :: {PAGE_TITLE}</title>
 
 <style type="text/css">
-- 
cgit v1.2.1


From 16c5352a12cef9572712f4600b8dd9313d2c9d2a Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Thu, 14 Jul 2011 21:00:10 +0100
Subject: [ticket/10032] Fixed typos in bbcode button name.

addlistitem was addlitsitem.

PHPBB3-10032
---
 phpBB/styles/subsilver2/template/posting_buttons.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index 92b4bd3e39..26d1e5e1a5 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -45,7 +45,7 @@
 		<input type="button" class="btnbbcode" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
 		<input type="button" class="btnbbcode" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
 		<input type="button" class="btnbbcode" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
-		<input type="button" class="btnbbcode" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />				
+		<input type="button" class="btnbbcode" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />				
 		<!-- IF S_BBCODE_IMG -->
 			<input type="button" class="btnbbcode" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
 		<!-- ENDIF -->
-- 
cgit v1.2.1


From 91b20ddba505ebfb38aef8de4db1e63aad5bf1fb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 14 Jul 2011 22:29:27 +0200
Subject: [ticket/7291] Use template loop for character list, to avoid double
 &first_char

PHPBB3-7291
---
 phpBB/styles/subsilver2/template/memberlist_body.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html
index cb7a7b20c7..800162b7b0 100644
--- a/phpBB/styles/subsilver2/template/memberlist_body.html
+++ b/phpBB/styles/subsilver2/template/memberlist_body.html
@@ -14,7 +14,12 @@
 	<form method="post" name="charsearch" action="{S_MODE_ACTION}">
 		<table width="100%" cellspacing="1">
 		<tr>
-			<td align="{S_CONTENT_FLOW_BEGIN}"><span class="genmed">{L_USERNAME_BEGINS_WITH}: </span><select name="first_char" onchange="this.form.submit();">{S_CHAR_OPTIONS}</select>&nbsp;<input type="submit" name="char" value="{L_DISPLAY}" class="btnlite" /></td>
+			<td align="{S_CONTENT_FLOW_BEGIN}"><span class="genmed">{L_USERNAME_BEGINS_WITH}: </span>
+				<select name="first_char" onchange="this.form.submit();">
+					<!-- BEGIN first_char -->
+						<option value="{first_char.VALUE}"<!-- IF first_char.S_SELECTED --> selected="selected"<!-- ENDIF -->>{first_char.DESC}</option>
+					<!-- END first_char -->
+				</select>&nbsp;<input type="submit" name="char" value="{L_DISPLAY}" class="btnlite" /></td>
 	<!-- IF U_FIND_MEMBER and not S_SEARCH_USER -->
 			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_FIND_MEMBER}">{L_FIND_USERNAME}</a></td>
 	<!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP -->
-- 
cgit v1.2.1


From 17bf983cdc9de05273d0279af5f0b5043d3d53b4 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 17 Jul 2011 10:05:40 +0200
Subject: [ticket/10155] Move jQuery inclusion to footer

PHPBB3-10155
---
 phpBB/styles/subsilver2/template/overall_footer.html | 2 ++
 phpBB/styles/subsilver2/template/overall_header.html | 1 -
 phpBB/styles/subsilver2/template/simple_footer.html  | 2 ++
 phpBB/styles/subsilver2/template/simple_header.html  | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 4494ed83bf..3cdd071211 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -8,5 +8,7 @@
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 4ceebf848c..a27c13624b 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -25,7 +25,6 @@
 
 <link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
 
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 <script type="text/javascript">
 // <![CDATA[
 <!-- IF S_USER_PM_POPUP and S_NEW_PM -->
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index e2469c4ed4..f03d1094f2 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -5,5 +5,7 @@
 	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group</span>
 </div>
 
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
index d2324e9048..9fcca4eb30 100644
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ b/phpBB/styles/subsilver2/template/simple_header.html
@@ -14,7 +14,6 @@
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
 <link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From b4949675bfdd11212b9e38681b0ecce79d72ab24 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 20 Jul 2011 00:25:45 +0200
Subject: [ticket/8571] Also display age on memberlist/viewprofile when age is
 0.

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

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 9ef2b85878..0afa750c79 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -148,10 +148,10 @@
 				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_LOCATION}: </td>
 				<td><!-- IF LOCATION --><b class="genmed">{LOCATION}</b><!-- ENDIF --></td>
 			</tr>
-			<!-- IF AGE -->
+			<!-- IF AGE !== '' -->
 			<tr>
 				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_AGE}: </td>
-				<td><b class="genmed"><!-- IF AGE -->{AGE}<!-- ELSE --> - <!-- ENDIF --></b></td>
+				<td><b class="genmed">{AGE}</b></td>
 			</tr>
 			<!-- ENDIF -->
 			<tr>
-- 
cgit v1.2.1


From 681c4a478d6eff7dbcebadca04f4afa28da750a8 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 29 Jul 2011 16:32:22 +0200
Subject: [ticket/10258] Add HTML5 meta charset tag

This allows knowing the charset when saving web pages to disk. Also, this is
supported by all browsers.

PHPBB3-10258
---
 phpBB/styles/subsilver2/template/overall_header.html           | 1 +
 phpBB/styles/subsilver2/template/simple_header.html            | 1 +
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 1 +
 phpBB/styles/subsilver2/template/viewtopic_print.html          | 1 +
 4 files changed, 4 insertions(+)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 4d646ac0e7..4fca1b6c09 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
+<meta charset="utf-8">
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
index c88eea524a..79236434f2 100644
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ b/phpBB/styles/subsilver2/template/simple_header.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
+<meta charset="utf-8">
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index 6eb8396dbf..e52389cc15 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
+<meta charset="utf-8">
 <title>{SITENAME} :: {PAGE_TITLE}</title>
 
 <style type="text/css">
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index c05066aa14..07da8ef752 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
+<meta charset="utf-8">
 <title>{SITENAME} :: {PAGE_TITLE}</title>
 
 <style type="text/css">
-- 
cgit v1.2.1


From 9c6339fb57d44caf86af43624d3308f6413b2c7d Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Mon, 11 Jul 2011 18:00:42 +0100
Subject: [ticket/8173] Removed some redundant code in the BBCode JavaScript.

The following code can be found in the ACP, when changing a user's
signature:

t: '{ BBCODE_T_HELP }',

The code that uses it and the code that produces it were changed or
removed a while ago, but this code remained. In 2c4c1f9, the accesskey
for the list item button was changed to y from t, explaining the origin of
the redundant code - although it wasn't being used then, either.

This commit also changes the helpline code of "[*]" to y, as the access
key is y, so this makes it more consistent.

PHPBB3-8173
---
 phpBB/styles/subsilver2/template/posting_buttons.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index 92b4bd3e39..5bab9c50ce 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -22,9 +22,8 @@
 			a: '{LA_BBCODE_A_HELP}',
 			s: '{LA_BBCODE_S_HELP}',
 			f: '{LA_BBCODE_F_HELP}',
-			e: '{LA_BBCODE_E_HELP}',
+			y: '{LA_BBCODE_Y_HELP}',
 			d: '{LA_BBCODE_D_HELP}',
-			t: '{LA_BBCODE_T_HELP}',
 			tip: '{L_STYLES_TIP}'
 			<!-- BEGIN custom_tags -->
 				,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
-- 
cgit v1.2.1


From d59a894cd3b7875b28e438d98e4aa05e9d97cce1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 30 Jul 2011 16:58:33 +0200
Subject: [ticket/10298] Properly close embed tag for QuickTime in subsilver2.

PHPBB3-10298
---
 phpBB/styles/subsilver2/template/attachment.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/attachment.html b/phpBB/styles/subsilver2/template/attachment.html
index b5b547b2e6..fca620b481 100644
--- a/phpBB/styles/subsilver2/template/attachment.html
+++ b/phpBB/styles/subsilver2/template/attachment.html
@@ -72,7 +72,7 @@
 				<param name="controller" value="true">
 				<param name="autoplay" value="false" />
 				<param name="type" value="video/quicktime">
-				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="320" height="285" type="video/quicktime" autoplay="false"> 
+				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="320" height="285" type="video/quicktime" autoplay="false"></embed>
 			</object>
 		<!-- ELSEIF _file.S_RM_FILE -->
 			<object id="rmstream_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="200" height="50">
-- 
cgit v1.2.1


From e0bb46c852638ed22281cff88a425e6ec983f17a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 8 Jul 2011 12:33:29 +0200
Subject: [ticket/10253] Fix IE9 handling in javascript, to correctly quote
 text.

Since IE9 IE supports textarea.selectionStart and window.getSelection.
The only problem is, that the values are still incorrect.
Therefore we need to ensure that it is still treated the old way,
until IE fixes this completely.

PHPBB3-10253
---
 phpBB/styles/subsilver2/template/editor.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index cd22812bab..7cc5de9034 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -151,8 +151,10 @@ function insert_text(text, spaces, popup)
 	{
 		text = ' ' + text + ' ';
 	}
-	
-	if (!isNaN(textarea.selectionStart))
+
+	// Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way.
+	// Therefore we simply add a !is_ie here until IE fixes the text-selection completely.
+	if (!isNaN(textarea.selectionStart) && !is_ie)
 	{
 		var sel_start = textarea.selectionStart;
 		var sel_end = textarea.selectionEnd;
@@ -218,11 +220,12 @@ function addquote(post_id, username, l_wrote)
 	}
 
 	// Get text selection - not only the post content :(
-	if (window.getSelection)
+	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
+	if (window.getSelection && !is_ie)
 	{
 		theSelection = window.getSelection().toString();
 	}
-	else if (document.getSelection)
+	else if (document.getSelection && !is_ie)
 	{
 		theSelection = document.getSelection();
 	}
-- 
cgit v1.2.1


From e9c43704448f6145f788ea11898ab84d15e50318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Wed, 10 Aug 2011 14:42:05 +0200
Subject: [ticket/10312] Un-check the shadow option while moving.

Don't create a shadow topic by default when moving a topic
the user should have the option to do this but it shouldn't
be done by default.

PHPBB3-10312
---
 phpBB/styles/subsilver2/template/mcp_move.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/mcp_move.html b/phpBB/styles/subsilver2/template/mcp_move.html
index c1027cdbf3..72a53f7bdb 100644
--- a/phpBB/styles/subsilver2/template/mcp_move.html
+++ b/phpBB/styles/subsilver2/template/mcp_move.html
@@ -17,7 +17,7 @@
 				<span class="gen"><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span>
 					<select name="to_forum_id">{S_FORUM_SELECT}</select><br />
 				<!-- IF S_CAN_LEAVE_SHADOW -->
-					<input type="checkbox" class="radio" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br />
+					<input type="checkbox" class="radio" name="move_leave_shadow" /><span class="gen">{L_LEAVE_SHADOW}</span><br />
 				<!-- ENDIF -->
 				<!-- IF S_CAN_LOCK_TOPIC -->
 					<input type="checkbox" class="radio" name="move_lock_topics" checked="checked" /><span class="gen">{L_LOCK_TOPIC}</span><br />
-- 
cgit v1.2.1


From bf2b4a81d331c086e362a8cbcf3358324325c012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Wed, 10 Aug 2011 17:17:13 +0200
Subject: [ticket/10316] Resolve inconsistent move topic behavior

When moving a topic you can straight away lock it, when using proSilver
this checkbox is unchecked by default. subSilver2 however has this
checked.
Change subSilver2 to not check the box by default and behave as
proSilver does.

PHPBB3-10316
---
 phpBB/styles/subsilver2/template/mcp_move.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/mcp_move.html b/phpBB/styles/subsilver2/template/mcp_move.html
index c1027cdbf3..ccfe5ecd4d 100644
--- a/phpBB/styles/subsilver2/template/mcp_move.html
+++ b/phpBB/styles/subsilver2/template/mcp_move.html
@@ -20,7 +20,7 @@
 					<input type="checkbox" class="radio" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br />
 				<!-- ENDIF -->
 				<!-- IF S_CAN_LOCK_TOPIC -->
-					<input type="checkbox" class="radio" name="move_lock_topics" checked="checked" /><span class="gen">{L_LOCK_TOPIC}</span><br />
+					<input type="checkbox" class="radio" name="move_lock_topics" /><span class="gen">{L_LOCK_TOPIC}</span><br />
 				<!-- ENDIF -->
 				<br />{S_HIDDEN_FIELDS}<span class="gen">{MESSAGE_TEXT}</span><br /><br />
 				<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" />
-- 
cgit v1.2.1


From ad207589163475fed4b3b207676d7474d51a7f60 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 23 Aug 2011 00:11:15 +0200
Subject: [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.

PHPBB3-9474
---
 phpBB/styles/subsilver2/template/mcp_viewlogs.html | 52 ----------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 phpBB/styles/subsilver2/template/mcp_viewlogs.html

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/mcp_viewlogs.html b/phpBB/styles/subsilver2/template/mcp_viewlogs.html
deleted file mode 100644
index 64e51ba498..0000000000
--- a/phpBB/styles/subsilver2/template/mcp_viewlogs.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- INCLUDE mcp_header.html -->
-
-<form method="post" name="mcp" action="{S_MCP_ACTION}">
-
-<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">
-<tr>
-	<th colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" nowrap="nowrap">{L_DISPLAY_OPTIONS}</th>
-</tr>
-<tr>
-	<td colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" class="cat" align="center"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
-</tr>
-<tr>
-	<th width="15%" nowrap="nowrap">{L_USERNAME}</th>
-	<th width="12%" nowrap="nowrap">{L_IP}</th>
-	<th width="18%" nowrap="nowrap">{L_TIME}</th>
-	<th width="45%" nowrap="nowrap">{L_ACTION}</th>
-	<!-- IF not S_TOPIC_ID -->
-		<th width="8%" nowrap="nowrap"></th>
-	<!-- ENDIF -->
-</tr>
-<!-- IF S_TOPIC_ID -->
-	<tr>
-		<td class="row3" colspan="5"><span class="gensmall">{L_LOGS_CURRENT_TOPIC} <a href="{U_VIEW_TOPIC}"><b>{TOPIC_NAME}</b></a></span></td>
-	</tr>
-<!-- ENDIF -->
-<!-- BEGIN log -->
-	<tr>
-		<td class="row1" nowrap="nowrap"><span class="gen">{log.USERNAME}</span></td>
-		<td class="row1" align="center" nowrap="nowrap"><span class="gen">{log.IP}</span></td>
-		<td class="row1" align="center" nowrap="nowrap"><span class="gensmall">{log.TIME}</span></td>
-		<td class="row1"><span class="gen">{log.ACTION}</span></td>
-		<!-- IF not S_TOPIC_ID -->
-		<td class="row1" align="center" nowrap="nowrap"><span class="gensmall"><!-- IF log.U_VIEW_TOPIC --><a href="{log.U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a><!-- IF log.U_VIEWLOGS --> | <!-- ENDIF --><!-- ENDIF --><!-- IF log.U_VIEWLOGS --><a href="{log.U_VIEWLOGS}">{L_VIEW_TOPIC_LOGS}</a><!-- ENDIF --></span></td>
-		<!-- ENDIF -->
-	</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td class="row1" colspan="<!-- IF S_TOPIC_ID -->4<!-- ELSE -->5<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
-	</tr>
-<!-- END log -->
-</table>
-{S_FORM_TOKEN}
-</form>
-
-<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
-<tr>
-	<td class="nav" align="{S_CONTENT_FLOW_BEGIN}" valign="middle">{PAGE_NUMBER}</td>
-	<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
-</tr>
-</table>
-
-<!-- INCLUDE mcp_footer.html -->
-- 
cgit v1.2.1


From 4499be5795d0c8d0de2b953e9fef8a098c9842a8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 25 Aug 2011 17:44:45 +0200
Subject: [ticket/10341] Also show forum/topic name of "0" as most active
 forum/topic.

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

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 0afa750c79..434d795895 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -89,11 +89,11 @@
 			<!-- IF S_SHOW_ACTIVITY -->
 				<tr>
 					<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_ACTIVE_IN_FORUM}: </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 class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_ACTIVE_IN_TOPIC}: </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 -->
 			</table>
-- 
cgit v1.2.1


From 6a2b13632de1ab39cdd126785a4aa2057fa9d6ab Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 27 Aug 2011 00:25:38 +0200
Subject: [ticket/10344] Add attachment icons to list of reported and queued
 posts/topics

PHPBB3-10344
---
 phpBB/styles/subsilver2/template/mcp_front.html   | 6 +++---
 phpBB/styles/subsilver2/template/mcp_queue.html   | 2 +-
 phpBB/styles/subsilver2/template/mcp_reports.html | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/mcp_front.html b/phpBB/styles/subsilver2/template/mcp_front.html
index ad8b776628..f4b146f4c5 100644
--- a/phpBB/styles/subsilver2/template/mcp_front.html
+++ b/phpBB/styles/subsilver2/template/mcp_front.html
@@ -19,7 +19,7 @@
 		<tr>
 			<td class="row1" width="15%" valign="top"><span class="gen"><!-- IF unapproved.U_FORUM --><a href="{unapproved.U_FORUM}">{unapproved.FORUM_NAME}</a><!-- ELSE -->{unapproved.FORUM_NAME}<!-- ENDIF --></span><!-- IF unapproved.U_MCP_FORUM --><br /><span class="gensmall">[ <a href="{unapproved.U_MCP_FORUM}">{L_MODERATE}</a> ]</span><!-- ENDIF --></td>
 			<td class="row2" valign="top"><span class="gen"><a href="{unapproved.U_TOPIC}">{unapproved.TOPIC_TITLE}</a></span><br /><span class="gensmall">[ <a href="{unapproved.U_MCP_TOPIC}">{L_MODERATE}</a> ]</span></td>
-			<td class="row1" valign="top"><span class="gen">{unapproved.SUBJECT}</span><br /><span class="gensmall">[ <a href="{unapproved.U_POST_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
+			<td class="row1" valign="top">{unapproved.ATTACH_ICON_IMG} <span class="gen">{unapproved.SUBJECT}</span><br /><span class="gensmall">[ <a href="{unapproved.U_POST_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
 			<td class="row2" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{unapproved.AUTHOR_FULL}</span></td>
 			<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>
@@ -66,7 +66,7 @@
 		<tr>
 			<td class="row1" width="15%" valign="top"><span class="gen"><!-- IF report.U_FORUM --><a href="{report.U_FORUM}">{report.FORUM_NAME}</a><!-- ELSE -->{report.FORUM_NAME}<!-- ENDIF --></span><!-- IF report.U_MCP_FORUM --><br /><span class="gensmall">[ <a href="{report.U_MCP_FORUM}">{L_MODERATE}</a> ]</span><!-- ENDIF --></td>
 			<td class="row2" valign="top"><span class="gen"><a href="{report.U_TOPIC}">{report.TOPIC_TITLE}</a></span><br /><span class="gensmall">[ <a href="{report.U_MCP_TOPIC}">{L_MODERATE}</a> ]</span></td>
-			<td class="row1" valign="top"><span class="gen">{report.SUBJECT}</span><br /><span class="gensmall">[ <a href="{report.U_POST_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
+			<td class="row1" valign="top">{report.ATTACH_ICON_IMG} <span class="gen">{report.SUBJECT}</span><br /><span class="gensmall">[ <a href="{report.U_POST_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
 			<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>
@@ -100,7 +100,7 @@
 	</tr>
 	<!-- BEGIN pm_report -->
 		<tr>
-			<td class="row1" valign="top"><span class="gen">{pm_report.PM_SUBJECT}</span><br /><span class="gensmall">[ <a href="{pm_report.U_PM_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
+			<td class="row1" valign="top">{pm_report.ATTACH_ICON_IMG} <span class="gen">{pm_report.PM_SUBJECT}</span><br /><span class="gensmall">[ <a href="{pm_report.U_PM_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
 			<td class="row2" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{pm_report.PM_AUTHOR_FULL}</span></td>
 			<td class="row1" align="center" width="15%" nowrap="nowrap" valign="top"><span class="gen">{pm_report.RECIPIENTS}</span></td>
 			<td class="row2" align="center" width="10%" nowrap="nowrap" valign="top"><span class="gensmall">{pm_report.PM_TIME}</span></td>
diff --git a/phpBB/styles/subsilver2/template/mcp_queue.html b/phpBB/styles/subsilver2/template/mcp_queue.html
index 7a35cc8044..6e39ccd272 100644
--- a/phpBB/styles/subsilver2/template/mcp_queue.html
+++ b/phpBB/styles/subsilver2/template/mcp_queue.html
@@ -18,7 +18,7 @@
 <!-- BEGIN postrow -->
 
 	<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td style="padding: 4px;"><p class="topictitle"><a href="{postrow.U_VIEWPOST}">{postrow.POST_SUBJECT}</a></p>
+		<td style="padding: 4px;"><p class="topictitle">{postrow.ATTACH_ICON_IMG} <a href="{postrow.U_VIEWPOST}">{postrow.POST_SUBJECT}</a></p>
 			<span class="gensmall"><!-- IF postrow.U_VIEWFORUM -->{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span></td>
 		<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.POST_AUTHOR_FULL}</span><br />
 			<span class="gensmall">[ <a href="{postrow.U_VIEW_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td>
diff --git a/phpBB/styles/subsilver2/template/mcp_reports.html b/phpBB/styles/subsilver2/template/mcp_reports.html
index 2e26a3e4cf..cfbd713321 100644
--- a/phpBB/styles/subsilver2/template/mcp_reports.html
+++ b/phpBB/styles/subsilver2/template/mcp_reports.html
@@ -25,12 +25,12 @@
 
 	<!-- IF postrow.S_ROW_ is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<!-- IF S_PM -->
-		<td style="padding: 4px;"><p class="topictitle"><a href="{postrow.U_VIEW_DETAILS}">{postrow.PM_SUBJECT}</a></p>
+		<td style="padding: 4px;"><p class="topictitle">{postrow.ATTACH_ICON_IMG} <a href="{postrow.U_VIEW_DETAILS}">{postrow.PM_SUBJECT}</a></p>
 			<span class="gensmall">{L_PM_FROM}: {postrow.PM_AUTHOR_FULL}</span></td>
 		<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><span class="gen">{postrow.RECIPIENTS}</span><br />
 			<span class="gensmall">{L_SENT_AT}: {postrow.PM_TIME}</span></td>
 		<!-- ELSE -->
-		<td style="padding: 4px;"><p class="topictitle"><a href="{postrow.U_VIEWPOST}">{postrow.POST_SUBJECT}</a></p>
+		<td style="padding: 4px;"><p class="topictitle">{postrow.ATTACH_ICON_IMG} <a href="{postrow.U_VIEWPOST}">{postrow.POST_SUBJECT}</a></p>
 			<span class="gensmall"><!-- IF postrow.U_VIEWFORUM -->{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span></td>
 		<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.POST_AUTHOR_FULL}</span><br />
 			<span class="gensmall">{postrow.POST_TIME}</span></td>
-- 
cgit v1.2.1


From e5daccdf33f2472beabab1da8091adc48bdf64cf Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 3 Sep 2011 18:51:33 +0300
Subject: [feature/remove-imagesets] Moving images

Removing imagesets. Moving images

PHPBB3-10336
---
 phpBB/styles/subsilver2/imageset/announce_read.gif      | Bin 307 -> 0 bytes
 .../styles/subsilver2/imageset/announce_read_locked.gif | Bin 304 -> 0 bytes
 .../subsilver2/imageset/announce_read_locked_mine.gif   | Bin 324 -> 0 bytes
 phpBB/styles/subsilver2/imageset/announce_read_mine.gif | Bin 328 -> 0 bytes
 phpBB/styles/subsilver2/imageset/announce_unread.gif    | Bin 289 -> 0 bytes
 .../subsilver2/imageset/announce_unread_locked.gif      | Bin 292 -> 0 bytes
 .../subsilver2/imageset/announce_unread_locked_mine.gif | Bin 308 -> 0 bytes
 .../styles/subsilver2/imageset/announce_unread_mine.gif | Bin 305 -> 0 bytes
 phpBB/styles/subsilver2/imageset/en/button_pm_new.gif   | Bin 1135 -> 0 bytes
 phpBB/styles/subsilver2/imageset/en/button_pm_reply.gif | Bin 1667 -> 0 bytes
 .../subsilver2/imageset/en/button_topic_locked.gif      | Bin 1101 -> 0 bytes
 .../styles/subsilver2/imageset/en/button_topic_new.gif  | Bin 1164 -> 0 bytes
 .../subsilver2/imageset/en/button_topic_reply.gif       | Bin 1234 -> 0 bytes
 .../styles/subsilver2/imageset/en/icon_contact_aim.gif  | Bin 580 -> 0 bytes
 .../subsilver2/imageset/en/icon_contact_email.gif       | Bin 659 -> 0 bytes
 .../styles/subsilver2/imageset/en/icon_contact_icq.gif  | Bin 574 -> 0 bytes
 .../subsilver2/imageset/en/icon_contact_jabber.gif      | Bin 674 -> 0 bytes
 .../styles/subsilver2/imageset/en/icon_contact_msnm.gif | Bin 1503 -> 0 bytes
 phpBB/styles/subsilver2/imageset/en/icon_contact_pm.gif | Bin 706 -> 0 bytes
 .../styles/subsilver2/imageset/en/icon_contact_www.gif  | Bin 604 -> 0 bytes
 .../subsilver2/imageset/en/icon_contact_yahoo.gif       | Bin 663 -> 0 bytes
 .../styles/subsilver2/imageset/en/icon_post_delete.gif  | Bin 314 -> 0 bytes
 phpBB/styles/subsilver2/imageset/en/icon_post_edit.gif  | Bin 662 -> 0 bytes
 phpBB/styles/subsilver2/imageset/en/icon_post_info.gif  | Bin 305 -> 0 bytes
 phpBB/styles/subsilver2/imageset/en/icon_post_quote.gif | Bin 666 -> 0 bytes
 .../styles/subsilver2/imageset/en/icon_post_report.gif  | Bin 308 -> 0 bytes
 .../styles/subsilver2/imageset/en/icon_user_offline.gif | Bin 547 -> 0 bytes
 .../styles/subsilver2/imageset/en/icon_user_online.gif  | Bin 520 -> 0 bytes
 .../styles/subsilver2/imageset/en/icon_user_profile.gif | Bin 667 -> 0 bytes
 .../styles/subsilver2/imageset/en/icon_user_search.gif  | Bin 608 -> 0 bytes
 phpBB/styles/subsilver2/imageset/en/icon_user_warn.gif  | Bin 673 -> 0 bytes
 phpBB/styles/subsilver2/imageset/forum_link.gif         | Bin 714 -> 0 bytes
 phpBB/styles/subsilver2/imageset/forum_read.gif         | Bin 677 -> 0 bytes
 phpBB/styles/subsilver2/imageset/forum_read_locked.gif  | Bin 673 -> 0 bytes
 .../styles/subsilver2/imageset/forum_read_subforum.gif  | Bin 705 -> 0 bytes
 phpBB/styles/subsilver2/imageset/forum_unread.gif       | Bin 663 -> 0 bytes
 .../styles/subsilver2/imageset/forum_unread_locked.gif  | Bin 660 -> 0 bytes
 .../subsilver2/imageset/forum_unread_subforum.gif       | Bin 688 -> 0 bytes
 phpBB/styles/subsilver2/imageset/icon_post_target.gif   | Bin 122 -> 0 bytes
 .../subsilver2/imageset/icon_post_target_unread.gif     | Bin 122 -> 0 bytes
 phpBB/styles/subsilver2/imageset/icon_topic_attach.gif  | Bin 217 -> 0 bytes
 phpBB/styles/subsilver2/imageset/icon_topic_latest.gif  | Bin 135 -> 0 bytes
 phpBB/styles/subsilver2/imageset/icon_topic_newest.gif  | Bin 133 -> 0 bytes
 .../styles/subsilver2/imageset/icon_topic_reported.gif  | Bin 462 -> 0 bytes
 .../subsilver2/imageset/icon_topic_unapproved.gif       | Bin 334 -> 0 bytes
 phpBB/styles/subsilver2/imageset/poll_center.gif        | Bin 92 -> 0 bytes
 phpBB/styles/subsilver2/imageset/poll_left.gif          | Bin 113 -> 0 bytes
 phpBB/styles/subsilver2/imageset/poll_right.gif         | Bin 113 -> 0 bytes
 phpBB/styles/subsilver2/imageset/site_logo.gif          | Bin 7151 -> 0 bytes
 phpBB/styles/subsilver2/imageset/sticky_read.gif        | Bin 344 -> 0 bytes
 phpBB/styles/subsilver2/imageset/sticky_read_locked.gif | Bin 338 -> 0 bytes
 .../subsilver2/imageset/sticky_read_locked_mine.gif     | Bin 336 -> 0 bytes
 phpBB/styles/subsilver2/imageset/sticky_read_mine.gif   | Bin 352 -> 0 bytes
 phpBB/styles/subsilver2/imageset/sticky_unread.gif      | Bin 325 -> 0 bytes
 .../styles/subsilver2/imageset/sticky_unread_locked.gif | Bin 324 -> 0 bytes
 .../subsilver2/imageset/sticky_unread_locked_mine.gif   | Bin 336 -> 0 bytes
 phpBB/styles/subsilver2/imageset/sticky_unread_mine.gif | Bin 339 -> 0 bytes
 phpBB/styles/subsilver2/imageset/topic_moved.gif        | Bin 660 -> 0 bytes
 phpBB/styles/subsilver2/imageset/topic_read.gif         | Bin 344 -> 0 bytes
 phpBB/styles/subsilver2/imageset/topic_read_hot.gif     | Bin 1902 -> 0 bytes
 .../styles/subsilver2/imageset/topic_read_hot_mine.gif  | Bin 1903 -> 0 bytes
 phpBB/styles/subsilver2/imageset/topic_read_locked.gif  | Bin 333 -> 0 bytes
 .../subsilver2/imageset/topic_read_locked_mine.gif      | Bin 337 -> 0 bytes
 phpBB/styles/subsilver2/imageset/topic_read_mine.gif    | Bin 350 -> 0 bytes
 phpBB/styles/subsilver2/imageset/topic_unread.gif       | Bin 336 -> 0 bytes
 phpBB/styles/subsilver2/imageset/topic_unread_hot.gif   | Bin 1888 -> 0 bytes
 .../subsilver2/imageset/topic_unread_hot_mine.gif       | Bin 1895 -> 0 bytes
 .../styles/subsilver2/imageset/topic_unread_locked.gif  | Bin 459 -> 0 bytes
 .../subsilver2/imageset/topic_unread_locked_mine.gif    | Bin 334 -> 0 bytes
 phpBB/styles/subsilver2/imageset/topic_unread_mine.gif  | Bin 350 -> 0 bytes
 phpBB/styles/subsilver2/imageset/upload_bar.gif         | Bin 12892 -> 0 bytes
 phpBB/styles/subsilver2/theme/en/button_pm_new.gif      | Bin 0 -> 1135 bytes
 phpBB/styles/subsilver2/theme/en/button_pm_reply.gif    | Bin 0 -> 1667 bytes
 .../styles/subsilver2/theme/en/button_topic_locked.gif  | Bin 0 -> 1101 bytes
 phpBB/styles/subsilver2/theme/en/button_topic_new.gif   | Bin 0 -> 1164 bytes
 phpBB/styles/subsilver2/theme/en/button_topic_reply.gif | Bin 0 -> 1234 bytes
 phpBB/styles/subsilver2/theme/en/icon_contact_aim.gif   | Bin 0 -> 580 bytes
 phpBB/styles/subsilver2/theme/en/icon_contact_email.gif | Bin 0 -> 659 bytes
 phpBB/styles/subsilver2/theme/en/icon_contact_icq.gif   | Bin 0 -> 574 bytes
 .../styles/subsilver2/theme/en/icon_contact_jabber.gif  | Bin 0 -> 674 bytes
 phpBB/styles/subsilver2/theme/en/icon_contact_msnm.gif  | Bin 0 -> 1503 bytes
 phpBB/styles/subsilver2/theme/en/icon_contact_pm.gif    | Bin 0 -> 706 bytes
 phpBB/styles/subsilver2/theme/en/icon_contact_www.gif   | Bin 0 -> 604 bytes
 phpBB/styles/subsilver2/theme/en/icon_contact_yahoo.gif | Bin 0 -> 663 bytes
 phpBB/styles/subsilver2/theme/en/icon_post_delete.gif   | Bin 0 -> 314 bytes
 phpBB/styles/subsilver2/theme/en/icon_post_edit.gif     | Bin 0 -> 662 bytes
 phpBB/styles/subsilver2/theme/en/icon_post_info.gif     | Bin 0 -> 305 bytes
 phpBB/styles/subsilver2/theme/en/icon_post_quote.gif    | Bin 0 -> 666 bytes
 phpBB/styles/subsilver2/theme/en/icon_post_report.gif   | Bin 0 -> 308 bytes
 phpBB/styles/subsilver2/theme/en/icon_user_offline.gif  | Bin 0 -> 547 bytes
 phpBB/styles/subsilver2/theme/en/icon_user_online.gif   | Bin 0 -> 520 bytes
 phpBB/styles/subsilver2/theme/en/icon_user_profile.gif  | Bin 0 -> 667 bytes
 phpBB/styles/subsilver2/theme/en/icon_user_search.gif   | Bin 0 -> 608 bytes
 phpBB/styles/subsilver2/theme/en/icon_user_warn.gif     | Bin 0 -> 673 bytes
 phpBB/styles/subsilver2/theme/images/announce_read.gif  | Bin 0 -> 307 bytes
 .../subsilver2/theme/images/announce_read_locked.gif    | Bin 0 -> 304 bytes
 .../theme/images/announce_read_locked_mine.gif          | Bin 0 -> 324 bytes
 .../subsilver2/theme/images/announce_read_mine.gif      | Bin 0 -> 328 bytes
 .../styles/subsilver2/theme/images/announce_unread.gif  | Bin 0 -> 289 bytes
 .../subsilver2/theme/images/announce_unread_locked.gif  | Bin 0 -> 292 bytes
 .../theme/images/announce_unread_locked_mine.gif        | Bin 0 -> 308 bytes
 .../subsilver2/theme/images/announce_unread_mine.gif    | Bin 0 -> 305 bytes
 phpBB/styles/subsilver2/theme/images/forum_link.gif     | Bin 0 -> 714 bytes
 phpBB/styles/subsilver2/theme/images/forum_read.gif     | Bin 0 -> 677 bytes
 .../subsilver2/theme/images/forum_read_locked.gif       | Bin 0 -> 673 bytes
 .../subsilver2/theme/images/forum_read_subforum.gif     | Bin 0 -> 705 bytes
 phpBB/styles/subsilver2/theme/images/forum_unread.gif   | Bin 0 -> 663 bytes
 .../subsilver2/theme/images/forum_unread_locked.gif     | Bin 0 -> 660 bytes
 .../subsilver2/theme/images/forum_unread_subforum.gif   | Bin 0 -> 688 bytes
 .../styles/subsilver2/theme/images/icon_post_target.gif | Bin 0 -> 122 bytes
 .../subsilver2/theme/images/icon_post_target_unread.gif | Bin 0 -> 122 bytes
 .../subsilver2/theme/images/icon_topic_attach.gif       | Bin 0 -> 217 bytes
 .../subsilver2/theme/images/icon_topic_latest.gif       | Bin 0 -> 135 bytes
 .../subsilver2/theme/images/icon_topic_newest.gif       | Bin 0 -> 133 bytes
 .../subsilver2/theme/images/icon_topic_reported.gif     | Bin 0 -> 462 bytes
 .../subsilver2/theme/images/icon_topic_unapproved.gif   | Bin 0 -> 334 bytes
 phpBB/styles/subsilver2/theme/images/poll_center.gif    | Bin 0 -> 92 bytes
 phpBB/styles/subsilver2/theme/images/poll_left.gif      | Bin 0 -> 113 bytes
 phpBB/styles/subsilver2/theme/images/poll_right.gif     | Bin 0 -> 113 bytes
 phpBB/styles/subsilver2/theme/images/site_logo.gif      | Bin 0 -> 7151 bytes
 phpBB/styles/subsilver2/theme/images/sticky_read.gif    | Bin 0 -> 344 bytes
 .../subsilver2/theme/images/sticky_read_locked.gif      | Bin 0 -> 338 bytes
 .../subsilver2/theme/images/sticky_read_locked_mine.gif | Bin 0 -> 336 bytes
 .../styles/subsilver2/theme/images/sticky_read_mine.gif | Bin 0 -> 352 bytes
 phpBB/styles/subsilver2/theme/images/sticky_unread.gif  | Bin 0 -> 325 bytes
 .../subsilver2/theme/images/sticky_unread_locked.gif    | Bin 0 -> 324 bytes
 .../theme/images/sticky_unread_locked_mine.gif          | Bin 0 -> 336 bytes
 .../subsilver2/theme/images/sticky_unread_mine.gif      | Bin 0 -> 339 bytes
 phpBB/styles/subsilver2/theme/images/topic_moved.gif    | Bin 0 -> 660 bytes
 phpBB/styles/subsilver2/theme/images/topic_read.gif     | Bin 0 -> 344 bytes
 phpBB/styles/subsilver2/theme/images/topic_read_hot.gif | Bin 0 -> 1902 bytes
 .../subsilver2/theme/images/topic_read_hot_mine.gif     | Bin 0 -> 1903 bytes
 .../subsilver2/theme/images/topic_read_locked.gif       | Bin 0 -> 333 bytes
 .../subsilver2/theme/images/topic_read_locked_mine.gif  | Bin 0 -> 337 bytes
 .../styles/subsilver2/theme/images/topic_read_mine.gif  | Bin 0 -> 350 bytes
 phpBB/styles/subsilver2/theme/images/topic_unread.gif   | Bin 0 -> 336 bytes
 .../styles/subsilver2/theme/images/topic_unread_hot.gif | Bin 0 -> 1888 bytes
 .../subsilver2/theme/images/topic_unread_hot_mine.gif   | Bin 0 -> 1895 bytes
 .../subsilver2/theme/images/topic_unread_locked.gif     | Bin 0 -> 459 bytes
 .../theme/images/topic_unread_locked_mine.gif           | Bin 0 -> 334 bytes
 .../subsilver2/theme/images/topic_unread_mine.gif       | Bin 0 -> 350 bytes
 phpBB/styles/subsilver2/theme/images/upload_bar.gif     | Bin 0 -> 12892 bytes
 142 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 phpBB/styles/subsilver2/imageset/announce_read.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/announce_read_locked.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/announce_read_locked_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/announce_read_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/announce_unread.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/announce_unread_locked.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/announce_unread_locked_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/announce_unread_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/button_pm_new.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/button_pm_reply.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/button_topic_locked.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/button_topic_new.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/button_topic_reply.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_contact_aim.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_contact_email.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_contact_icq.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_contact_jabber.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_contact_msnm.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_contact_pm.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_contact_www.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_contact_yahoo.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_post_delete.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_post_edit.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_post_info.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_post_quote.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_post_report.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_user_offline.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_user_online.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_user_profile.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_user_search.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/icon_user_warn.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/forum_link.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/forum_read.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/forum_read_locked.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/forum_read_subforum.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/forum_unread.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/forum_unread_locked.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/forum_unread_subforum.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/icon_post_target.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/icon_post_target_unread.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/icon_topic_attach.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/icon_topic_latest.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/icon_topic_newest.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/icon_topic_reported.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/icon_topic_unapproved.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/poll_center.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/poll_left.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/poll_right.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/site_logo.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/sticky_read.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/sticky_read_locked.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/sticky_read_locked_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/sticky_read_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/sticky_unread.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/sticky_unread_locked.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/sticky_unread_locked_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/sticky_unread_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_moved.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_read.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_read_hot.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_read_hot_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_read_locked.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_read_locked_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_read_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_unread.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_unread_hot.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_unread_hot_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_unread_locked.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_unread_locked_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/topic_unread_mine.gif
 delete mode 100644 phpBB/styles/subsilver2/imageset/upload_bar.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/button_pm_new.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/button_pm_reply.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/button_topic_locked.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/button_topic_new.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/button_topic_reply.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_contact_aim.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_contact_email.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_contact_icq.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_contact_jabber.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_contact_msnm.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_contact_pm.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_contact_www.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_contact_yahoo.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_post_delete.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_post_edit.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_post_info.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_post_quote.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_post_report.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_user_offline.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_user_online.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_user_profile.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_user_search.gif
 create mode 100644 phpBB/styles/subsilver2/theme/en/icon_user_warn.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/announce_read.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/announce_read_locked.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/announce_read_locked_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/announce_read_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/announce_unread.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/announce_unread_locked.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/announce_unread_locked_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/announce_unread_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/forum_link.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/forum_read.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/forum_read_locked.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/forum_read_subforum.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/forum_unread.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/forum_unread_locked.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/forum_unread_subforum.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/icon_post_target.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/icon_post_target_unread.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/icon_topic_attach.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/icon_topic_latest.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/icon_topic_newest.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/icon_topic_reported.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/icon_topic_unapproved.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/poll_center.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/poll_left.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/poll_right.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/site_logo.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/sticky_read.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/sticky_read_locked.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/sticky_read_locked_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/sticky_read_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/sticky_unread.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/sticky_unread_locked.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/sticky_unread_locked_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/sticky_unread_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_moved.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_read.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_read_hot.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_read_hot_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_read_locked.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_read_locked_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_read_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_unread.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_unread_hot.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_unread_hot_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_unread_locked.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_unread_locked_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/topic_unread_mine.gif
 create mode 100644 phpBB/styles/subsilver2/theme/images/upload_bar.gif

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/imageset/announce_read.gif b/phpBB/styles/subsilver2/imageset/announce_read.gif
deleted file mode 100644
index 0589feb14f..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/announce_read.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/announce_read_locked.gif b/phpBB/styles/subsilver2/imageset/announce_read_locked.gif
deleted file mode 100644
index a738616e06..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/announce_read_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/announce_read_locked_mine.gif b/phpBB/styles/subsilver2/imageset/announce_read_locked_mine.gif
deleted file mode 100644
index f7ffe7f8dd..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/announce_read_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/announce_read_mine.gif b/phpBB/styles/subsilver2/imageset/announce_read_mine.gif
deleted file mode 100644
index 636d353867..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/announce_read_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/announce_unread.gif b/phpBB/styles/subsilver2/imageset/announce_unread.gif
deleted file mode 100644
index 56b2702b17..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/announce_unread.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/announce_unread_locked.gif b/phpBB/styles/subsilver2/imageset/announce_unread_locked.gif
deleted file mode 100644
index 37033da653..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/announce_unread_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/announce_unread_locked_mine.gif b/phpBB/styles/subsilver2/imageset/announce_unread_locked_mine.gif
deleted file mode 100644
index d91f2520ca..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/announce_unread_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/announce_unread_mine.gif b/phpBB/styles/subsilver2/imageset/announce_unread_mine.gif
deleted file mode 100644
index e1dd23a0bf..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/announce_unread_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/button_pm_new.gif b/phpBB/styles/subsilver2/imageset/en/button_pm_new.gif
deleted file mode 100644
index 07df748d3a..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/button_pm_new.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/button_pm_reply.gif b/phpBB/styles/subsilver2/imageset/en/button_pm_reply.gif
deleted file mode 100644
index c476f06a44..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/button_pm_reply.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/button_topic_locked.gif b/phpBB/styles/subsilver2/imageset/en/button_topic_locked.gif
deleted file mode 100644
index 124a2d4a7d..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/button_topic_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/button_topic_new.gif b/phpBB/styles/subsilver2/imageset/en/button_topic_new.gif
deleted file mode 100644
index 66e1007129..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/button_topic_new.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/button_topic_reply.gif b/phpBB/styles/subsilver2/imageset/en/button_topic_reply.gif
deleted file mode 100644
index e8fe5115a0..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/button_topic_reply.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_aim.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_aim.gif
deleted file mode 100644
index c6533e2817..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_aim.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_email.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_email.gif
deleted file mode 100644
index f126a1960d..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_email.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_icq.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_icq.gif
deleted file mode 100644
index ba3fa12436..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_icq.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_jabber.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_jabber.gif
deleted file mode 100644
index be2e53f9c2..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_jabber.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_msnm.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_msnm.gif
deleted file mode 100644
index 1bf681e9a2..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_msnm.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_pm.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_pm.gif
deleted file mode 100644
index 26ac558c2f..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_pm.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_www.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_www.gif
deleted file mode 100644
index 14a33b36a5..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_www.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_yahoo.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_yahoo.gif
deleted file mode 100644
index d11711789f..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_yahoo.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_post_delete.gif b/phpBB/styles/subsilver2/imageset/en/icon_post_delete.gif
deleted file mode 100644
index e008e5ff9f..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_post_delete.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_post_edit.gif b/phpBB/styles/subsilver2/imageset/en/icon_post_edit.gif
deleted file mode 100644
index 1511ee34d3..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_post_edit.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_post_info.gif b/phpBB/styles/subsilver2/imageset/en/icon_post_info.gif
deleted file mode 100644
index 166de2724f..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_post_info.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_post_quote.gif b/phpBB/styles/subsilver2/imageset/en/icon_post_quote.gif
deleted file mode 100644
index 4cf103280c..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_post_quote.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_post_report.gif b/phpBB/styles/subsilver2/imageset/en/icon_post_report.gif
deleted file mode 100644
index 9a3f65b1e3..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_post_report.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_user_offline.gif b/phpBB/styles/subsilver2/imageset/en/icon_user_offline.gif
deleted file mode 100644
index 3065f4d7fe..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_user_offline.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_user_online.gif b/phpBB/styles/subsilver2/imageset/en/icon_user_online.gif
deleted file mode 100644
index b950612c57..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_user_online.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_user_profile.gif b/phpBB/styles/subsilver2/imageset/en/icon_user_profile.gif
deleted file mode 100644
index d9cf7f4c4a..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_user_profile.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_user_search.gif b/phpBB/styles/subsilver2/imageset/en/icon_user_search.gif
deleted file mode 100644
index 46475fbf4c..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_user_search.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/en/icon_user_warn.gif b/phpBB/styles/subsilver2/imageset/en/icon_user_warn.gif
deleted file mode 100644
index 44cbcc953a..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/en/icon_user_warn.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/forum_link.gif b/phpBB/styles/subsilver2/imageset/forum_link.gif
deleted file mode 100644
index d5e86d47d7..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/forum_link.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/forum_read.gif b/phpBB/styles/subsilver2/imageset/forum_read.gif
deleted file mode 100644
index 9b2bc47c67..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/forum_read.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/forum_read_locked.gif b/phpBB/styles/subsilver2/imageset/forum_read_locked.gif
deleted file mode 100644
index 436f3d21c8..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/forum_read_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/forum_read_subforum.gif b/phpBB/styles/subsilver2/imageset/forum_read_subforum.gif
deleted file mode 100644
index 9179303e7f..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/forum_read_subforum.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/forum_unread.gif b/phpBB/styles/subsilver2/imageset/forum_unread.gif
deleted file mode 100644
index 5eec565b38..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/forum_unread.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/forum_unread_locked.gif b/phpBB/styles/subsilver2/imageset/forum_unread_locked.gif
deleted file mode 100644
index 58a79c376c..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/forum_unread_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/forum_unread_subforum.gif b/phpBB/styles/subsilver2/imageset/forum_unread_subforum.gif
deleted file mode 100644
index af3c93b1a1..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/forum_unread_subforum.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/icon_post_target.gif b/phpBB/styles/subsilver2/imageset/icon_post_target.gif
deleted file mode 100644
index d172abb060..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/icon_post_target.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/icon_post_target_unread.gif b/phpBB/styles/subsilver2/imageset/icon_post_target_unread.gif
deleted file mode 100644
index 8ec44a1787..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/icon_post_target_unread.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/icon_topic_attach.gif b/phpBB/styles/subsilver2/imageset/icon_topic_attach.gif
deleted file mode 100644
index 1c9c89bc70..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/icon_topic_attach.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/icon_topic_latest.gif b/phpBB/styles/subsilver2/imageset/icon_topic_latest.gif
deleted file mode 100644
index b45e57aedb..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/icon_topic_latest.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/icon_topic_newest.gif b/phpBB/styles/subsilver2/imageset/icon_topic_newest.gif
deleted file mode 100644
index eca2861836..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/icon_topic_newest.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/icon_topic_reported.gif b/phpBB/styles/subsilver2/imageset/icon_topic_reported.gif
deleted file mode 100644
index 026092854a..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/icon_topic_reported.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/icon_topic_unapproved.gif b/phpBB/styles/subsilver2/imageset/icon_topic_unapproved.gif
deleted file mode 100644
index 2ccaf19c23..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/icon_topic_unapproved.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/poll_center.gif b/phpBB/styles/subsilver2/imageset/poll_center.gif
deleted file mode 100644
index 99473151ec..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/poll_center.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/poll_left.gif b/phpBB/styles/subsilver2/imageset/poll_left.gif
deleted file mode 100644
index 269088b81d..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/poll_left.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/poll_right.gif b/phpBB/styles/subsilver2/imageset/poll_right.gif
deleted file mode 100644
index f9584e23a1..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/poll_right.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/site_logo.gif b/phpBB/styles/subsilver2/imageset/site_logo.gif
deleted file mode 100644
index abce3cd51d..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/site_logo.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/sticky_read.gif b/phpBB/styles/subsilver2/imageset/sticky_read.gif
deleted file mode 100644
index 09861a996c..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/sticky_read.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/sticky_read_locked.gif b/phpBB/styles/subsilver2/imageset/sticky_read_locked.gif
deleted file mode 100644
index 24bca303d6..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/sticky_read_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/sticky_read_locked_mine.gif b/phpBB/styles/subsilver2/imageset/sticky_read_locked_mine.gif
deleted file mode 100644
index 3fd04ec3a9..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/sticky_read_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/sticky_read_mine.gif b/phpBB/styles/subsilver2/imageset/sticky_read_mine.gif
deleted file mode 100644
index 381634c364..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/sticky_read_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/sticky_unread.gif b/phpBB/styles/subsilver2/imageset/sticky_unread.gif
deleted file mode 100644
index dd2e366543..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/sticky_unread.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/sticky_unread_locked.gif b/phpBB/styles/subsilver2/imageset/sticky_unread_locked.gif
deleted file mode 100644
index 608f4822e3..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/sticky_unread_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/sticky_unread_locked_mine.gif b/phpBB/styles/subsilver2/imageset/sticky_unread_locked_mine.gif
deleted file mode 100644
index fe5e115312..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/sticky_unread_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/sticky_unread_mine.gif b/phpBB/styles/subsilver2/imageset/sticky_unread_mine.gif
deleted file mode 100644
index b5fc3b3627..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/sticky_unread_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_moved.gif b/phpBB/styles/subsilver2/imageset/topic_moved.gif
deleted file mode 100644
index fe758f02ca..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_moved.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_read.gif b/phpBB/styles/subsilver2/imageset/topic_read.gif
deleted file mode 100644
index c16bfa75d5..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_read.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_read_hot.gif b/phpBB/styles/subsilver2/imageset/topic_read_hot.gif
deleted file mode 100644
index a7a7e8fc78..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_read_hot.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_read_hot_mine.gif b/phpBB/styles/subsilver2/imageset/topic_read_hot_mine.gif
deleted file mode 100644
index 853452a74b..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_read_hot_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_read_locked.gif b/phpBB/styles/subsilver2/imageset/topic_read_locked.gif
deleted file mode 100644
index 10eb776972..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_read_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_read_locked_mine.gif b/phpBB/styles/subsilver2/imageset/topic_read_locked_mine.gif
deleted file mode 100644
index 3f24928b48..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_read_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_read_mine.gif b/phpBB/styles/subsilver2/imageset/topic_read_mine.gif
deleted file mode 100644
index 560927aa06..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_read_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_unread.gif b/phpBB/styles/subsilver2/imageset/topic_unread.gif
deleted file mode 100644
index 4e56157dce..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_unread.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_unread_hot.gif b/phpBB/styles/subsilver2/imageset/topic_unread_hot.gif
deleted file mode 100644
index ceef4919d5..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_unread_hot.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_unread_hot_mine.gif b/phpBB/styles/subsilver2/imageset/topic_unread_hot_mine.gif
deleted file mode 100644
index 1c748f708a..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_unread_hot_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_unread_locked.gif b/phpBB/styles/subsilver2/imageset/topic_unread_locked.gif
deleted file mode 100644
index 720e210289..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_unread_locked.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_unread_locked_mine.gif b/phpBB/styles/subsilver2/imageset/topic_unread_locked_mine.gif
deleted file mode 100644
index 90873431ef..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_unread_locked_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/topic_unread_mine.gif b/phpBB/styles/subsilver2/imageset/topic_unread_mine.gif
deleted file mode 100644
index 34fd2ec179..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/topic_unread_mine.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/imageset/upload_bar.gif b/phpBB/styles/subsilver2/imageset/upload_bar.gif
deleted file mode 100644
index 75cf61c59e..0000000000
Binary files a/phpBB/styles/subsilver2/imageset/upload_bar.gif and /dev/null differ
diff --git a/phpBB/styles/subsilver2/theme/en/button_pm_new.gif b/phpBB/styles/subsilver2/theme/en/button_pm_new.gif
new file mode 100644
index 0000000000..07df748d3a
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/button_pm_new.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/button_pm_reply.gif b/phpBB/styles/subsilver2/theme/en/button_pm_reply.gif
new file mode 100644
index 0000000000..c476f06a44
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/button_pm_reply.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/button_topic_locked.gif b/phpBB/styles/subsilver2/theme/en/button_topic_locked.gif
new file mode 100644
index 0000000000..124a2d4a7d
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/button_topic_locked.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/button_topic_new.gif b/phpBB/styles/subsilver2/theme/en/button_topic_new.gif
new file mode 100644
index 0000000000..66e1007129
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/button_topic_new.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/button_topic_reply.gif b/phpBB/styles/subsilver2/theme/en/button_topic_reply.gif
new file mode 100644
index 0000000000..e8fe5115a0
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/button_topic_reply.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_aim.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_aim.gif
new file mode 100644
index 0000000000..c6533e2817
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_contact_aim.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_email.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_email.gif
new file mode 100644
index 0000000000..f126a1960d
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_contact_email.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_icq.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_icq.gif
new file mode 100644
index 0000000000..ba3fa12436
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_contact_icq.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_jabber.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_jabber.gif
new file mode 100644
index 0000000000..be2e53f9c2
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_contact_jabber.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_msnm.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_msnm.gif
new file mode 100644
index 0000000000..1bf681e9a2
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_contact_msnm.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_pm.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_pm.gif
new file mode 100644
index 0000000000..26ac558c2f
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_contact_pm.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_www.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_www.gif
new file mode 100644
index 0000000000..14a33b36a5
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_contact_www.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_contact_yahoo.gif b/phpBB/styles/subsilver2/theme/en/icon_contact_yahoo.gif
new file mode 100644
index 0000000000..d11711789f
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_contact_yahoo.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_post_delete.gif b/phpBB/styles/subsilver2/theme/en/icon_post_delete.gif
new file mode 100644
index 0000000000..e008e5ff9f
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_post_delete.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_post_edit.gif b/phpBB/styles/subsilver2/theme/en/icon_post_edit.gif
new file mode 100644
index 0000000000..1511ee34d3
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_post_edit.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_post_info.gif b/phpBB/styles/subsilver2/theme/en/icon_post_info.gif
new file mode 100644
index 0000000000..166de2724f
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_post_info.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_post_quote.gif b/phpBB/styles/subsilver2/theme/en/icon_post_quote.gif
new file mode 100644
index 0000000000..4cf103280c
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_post_quote.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_post_report.gif b/phpBB/styles/subsilver2/theme/en/icon_post_report.gif
new file mode 100644
index 0000000000..9a3f65b1e3
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_post_report.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_user_offline.gif b/phpBB/styles/subsilver2/theme/en/icon_user_offline.gif
new file mode 100644
index 0000000000..3065f4d7fe
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_user_offline.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_user_online.gif b/phpBB/styles/subsilver2/theme/en/icon_user_online.gif
new file mode 100644
index 0000000000..b950612c57
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_user_online.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_user_profile.gif b/phpBB/styles/subsilver2/theme/en/icon_user_profile.gif
new file mode 100644
index 0000000000..d9cf7f4c4a
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_user_profile.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_user_search.gif b/phpBB/styles/subsilver2/theme/en/icon_user_search.gif
new file mode 100644
index 0000000000..46475fbf4c
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_user_search.gif differ
diff --git a/phpBB/styles/subsilver2/theme/en/icon_user_warn.gif b/phpBB/styles/subsilver2/theme/en/icon_user_warn.gif
new file mode 100644
index 0000000000..44cbcc953a
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/en/icon_user_warn.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_read.gif b/phpBB/styles/subsilver2/theme/images/announce_read.gif
new file mode 100644
index 0000000000..0589feb14f
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/announce_read.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_read_locked.gif b/phpBB/styles/subsilver2/theme/images/announce_read_locked.gif
new file mode 100644
index 0000000000..a738616e06
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/announce_read_locked.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_read_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/announce_read_locked_mine.gif
new file mode 100644
index 0000000000..f7ffe7f8dd
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/announce_read_locked_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_read_mine.gif b/phpBB/styles/subsilver2/theme/images/announce_read_mine.gif
new file mode 100644
index 0000000000..636d353867
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/announce_read_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_unread.gif b/phpBB/styles/subsilver2/theme/images/announce_unread.gif
new file mode 100644
index 0000000000..56b2702b17
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/announce_unread.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_unread_locked.gif b/phpBB/styles/subsilver2/theme/images/announce_unread_locked.gif
new file mode 100644
index 0000000000..37033da653
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/announce_unread_locked.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_unread_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/announce_unread_locked_mine.gif
new file mode 100644
index 0000000000..d91f2520ca
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/announce_unread_locked_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/announce_unread_mine.gif b/phpBB/styles/subsilver2/theme/images/announce_unread_mine.gif
new file mode 100644
index 0000000000..e1dd23a0bf
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/announce_unread_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_link.gif b/phpBB/styles/subsilver2/theme/images/forum_link.gif
new file mode 100644
index 0000000000..d5e86d47d7
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/forum_link.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_read.gif b/phpBB/styles/subsilver2/theme/images/forum_read.gif
new file mode 100644
index 0000000000..9b2bc47c67
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/forum_read.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_read_locked.gif b/phpBB/styles/subsilver2/theme/images/forum_read_locked.gif
new file mode 100644
index 0000000000..436f3d21c8
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/forum_read_locked.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_read_subforum.gif b/phpBB/styles/subsilver2/theme/images/forum_read_subforum.gif
new file mode 100644
index 0000000000..9179303e7f
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/forum_read_subforum.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_unread.gif b/phpBB/styles/subsilver2/theme/images/forum_unread.gif
new file mode 100644
index 0000000000..5eec565b38
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/forum_unread.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_unread_locked.gif b/phpBB/styles/subsilver2/theme/images/forum_unread_locked.gif
new file mode 100644
index 0000000000..58a79c376c
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/forum_unread_locked.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/forum_unread_subforum.gif b/phpBB/styles/subsilver2/theme/images/forum_unread_subforum.gif
new file mode 100644
index 0000000000..af3c93b1a1
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/forum_unread_subforum.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_post_target.gif b/phpBB/styles/subsilver2/theme/images/icon_post_target.gif
new file mode 100644
index 0000000000..d172abb060
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/icon_post_target.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_post_target_unread.gif b/phpBB/styles/subsilver2/theme/images/icon_post_target_unread.gif
new file mode 100644
index 0000000000..8ec44a1787
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/icon_post_target_unread.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_attach.gif b/phpBB/styles/subsilver2/theme/images/icon_topic_attach.gif
new file mode 100644
index 0000000000..1c9c89bc70
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/icon_topic_attach.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_latest.gif b/phpBB/styles/subsilver2/theme/images/icon_topic_latest.gif
new file mode 100644
index 0000000000..b45e57aedb
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/icon_topic_latest.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_newest.gif b/phpBB/styles/subsilver2/theme/images/icon_topic_newest.gif
new file mode 100644
index 0000000000..eca2861836
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/icon_topic_newest.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_reported.gif b/phpBB/styles/subsilver2/theme/images/icon_topic_reported.gif
new file mode 100644
index 0000000000..026092854a
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/icon_topic_reported.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/icon_topic_unapproved.gif b/phpBB/styles/subsilver2/theme/images/icon_topic_unapproved.gif
new file mode 100644
index 0000000000..2ccaf19c23
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/icon_topic_unapproved.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/poll_center.gif b/phpBB/styles/subsilver2/theme/images/poll_center.gif
new file mode 100644
index 0000000000..99473151ec
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/poll_center.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/poll_left.gif b/phpBB/styles/subsilver2/theme/images/poll_left.gif
new file mode 100644
index 0000000000..269088b81d
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/poll_left.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/poll_right.gif b/phpBB/styles/subsilver2/theme/images/poll_right.gif
new file mode 100644
index 0000000000..f9584e23a1
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/poll_right.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/site_logo.gif b/phpBB/styles/subsilver2/theme/images/site_logo.gif
new file mode 100644
index 0000000000..abce3cd51d
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/site_logo.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_read.gif b/phpBB/styles/subsilver2/theme/images/sticky_read.gif
new file mode 100644
index 0000000000..09861a996c
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/sticky_read.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_read_locked.gif b/phpBB/styles/subsilver2/theme/images/sticky_read_locked.gif
new file mode 100644
index 0000000000..24bca303d6
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/sticky_read_locked.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_read_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/sticky_read_locked_mine.gif
new file mode 100644
index 0000000000..3fd04ec3a9
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/sticky_read_locked_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_read_mine.gif b/phpBB/styles/subsilver2/theme/images/sticky_read_mine.gif
new file mode 100644
index 0000000000..381634c364
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/sticky_read_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_unread.gif b/phpBB/styles/subsilver2/theme/images/sticky_unread.gif
new file mode 100644
index 0000000000..dd2e366543
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/sticky_unread.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_unread_locked.gif b/phpBB/styles/subsilver2/theme/images/sticky_unread_locked.gif
new file mode 100644
index 0000000000..608f4822e3
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/sticky_unread_locked.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_unread_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/sticky_unread_locked_mine.gif
new file mode 100644
index 0000000000..fe5e115312
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/sticky_unread_locked_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/sticky_unread_mine.gif b/phpBB/styles/subsilver2/theme/images/sticky_unread_mine.gif
new file mode 100644
index 0000000000..b5fc3b3627
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/sticky_unread_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_moved.gif b/phpBB/styles/subsilver2/theme/images/topic_moved.gif
new file mode 100644
index 0000000000..fe758f02ca
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_moved.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read.gif b/phpBB/styles/subsilver2/theme/images/topic_read.gif
new file mode 100644
index 0000000000..c16bfa75d5
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_read.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read_hot.gif b/phpBB/styles/subsilver2/theme/images/topic_read_hot.gif
new file mode 100644
index 0000000000..a7a7e8fc78
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_read_hot.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read_hot_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_read_hot_mine.gif
new file mode 100644
index 0000000000..853452a74b
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_read_hot_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read_locked.gif b/phpBB/styles/subsilver2/theme/images/topic_read_locked.gif
new file mode 100644
index 0000000000..10eb776972
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_read_locked.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_read_locked_mine.gif
new file mode 100644
index 0000000000..3f24928b48
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_read_locked_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_read_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_read_mine.gif
new file mode 100644
index 0000000000..560927aa06
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_read_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread.gif b/phpBB/styles/subsilver2/theme/images/topic_unread.gif
new file mode 100644
index 0000000000..4e56157dce
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_unread.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread_hot.gif b/phpBB/styles/subsilver2/theme/images/topic_unread_hot.gif
new file mode 100644
index 0000000000..ceef4919d5
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_unread_hot.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread_hot_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_unread_hot_mine.gif
new file mode 100644
index 0000000000..1c748f708a
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_unread_hot_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread_locked.gif b/phpBB/styles/subsilver2/theme/images/topic_unread_locked.gif
new file mode 100644
index 0000000000..720e210289
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_unread_locked.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread_locked_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_unread_locked_mine.gif
new file mode 100644
index 0000000000..90873431ef
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_unread_locked_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/topic_unread_mine.gif b/phpBB/styles/subsilver2/theme/images/topic_unread_mine.gif
new file mode 100644
index 0000000000..34fd2ec179
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/topic_unread_mine.gif differ
diff --git a/phpBB/styles/subsilver2/theme/images/upload_bar.gif b/phpBB/styles/subsilver2/theme/images/upload_bar.gif
new file mode 100644
index 0000000000..75cf61c59e
Binary files /dev/null and b/phpBB/styles/subsilver2/theme/images/upload_bar.gif differ
-- 
cgit v1.2.1


From 929c13a52bb16ca61acbc75f4a708a9b4cd501c0 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 3 Sep 2011 18:53:23 +0300
Subject: [feature/remove-imagesets] Removing imageset files

Removing imagesets. Removing imageset files

PHPBB3-10336
---
 phpBB/styles/subsilver2/imageset/en/imageset.cfg |  47 -----------
 phpBB/styles/subsilver2/imageset/imageset.cfg    | 100 -----------------------
 2 files changed, 147 deletions(-)
 delete mode 100644 phpBB/styles/subsilver2/imageset/en/imageset.cfg
 delete mode 100644 phpBB/styles/subsilver2/imageset/imageset.cfg

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/imageset/en/imageset.cfg b/phpBB/styles/subsilver2/imageset/en/imageset.cfg
deleted file mode 100644
index c0cc699737..0000000000
--- a/phpBB/styles/subsilver2/imageset/en/imageset.cfg
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# phpBB Imageset Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2005 phpBB Group 
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes. 
-# Single and double quotes do not need to be escaped.
-#
-#
-
-# Images 
-img_icon_contact_aim = icon_contact_aim.gif
-img_icon_contact_email = icon_contact_email.gif
-img_icon_contact_icq = icon_contact_icq.gif
-img_icon_contact_jabber = icon_contact_jabber.gif
-img_icon_contact_msnm = icon_contact_msnm.gif
-img_icon_contact_pm = icon_contact_pm.gif
-img_icon_contact_yahoo = icon_contact_yahoo.gif
-img_icon_contact_www = icon_contact_www.gif
-
-img_icon_post_delete = icon_post_delete.gif
-img_icon_post_edit = icon_post_edit.gif
-img_icon_post_info = icon_post_info.gif
-img_icon_post_quote = icon_post_quote.gif
-img_icon_post_report = icon_post_report.gif
-
-img_icon_user_online = icon_user_online.gif
-img_icon_user_offline = icon_user_offline.gif
-img_icon_user_profile = icon_user_profile.gif
-img_icon_user_search = icon_user_search.gif
-img_icon_user_warn = icon_user_warn.gif
-
-img_button_pm_forward =
-img_button_pm_new = button_pm_new.gif
-img_button_pm_reply = button_pm_reply.gif
-img_button_topic_locked = button_topic_locked.gif
-img_button_topic_new = button_topic_new.gif
-img_button_topic_reply = button_topic_reply.gif
-
diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg
deleted file mode 100644
index 99c34d098f..0000000000
--- a/phpBB/styles/subsilver2/imageset/imageset.cfg
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# phpBB Imageset Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2005 phpBB Group
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes.
-# Single and double quotes do not need to be escaped.
-#
-#
-
-# General Information about this style
-name = subsilver2
-copyright = &copy; phpBB Group, 2003
-version = 3.1.0-dev
-
-# Images
-img_site_logo = site_logo.gif*94*170
-img_upload_bar = upload_bar.gif*16*280
-img_poll_left = poll_left.gif*12*4
-img_poll_center = poll_center.gif*12*1
-img_poll_right = poll_right.gif*12*4
-img_icon_friend =
-img_icon_foe =
-
-img_forum_link = forum_link.gif*25*46
-img_forum_read = forum_read.gif*25*46
-img_forum_read_locked = forum_read_locked.gif*25*46
-img_forum_read_subforum = forum_read_subforum.gif*25*46
-img_forum_unread = forum_unread.gif*25*46
-img_forum_unread_locked = forum_unread_locked.gif*25*46
-img_forum_unread_subforum = forum_unread_subforum.gif*25*46
-
-img_topic_moved = topic_moved.gif*18*19
-
-img_topic_read = topic_read.gif*18*19
-img_topic_read_mine = topic_read_mine.gif*18*19
-img_topic_read_hot = topic_read_hot.gif*18*19
-img_topic_read_hot_mine = topic_read_hot_mine.gif*18*19
-img_topic_read_locked = topic_read_locked.gif*18*19
-img_topic_read_locked_mine = topic_read_locked_mine.gif*18*19
-
-img_topic_unread = topic_unread.gif*18*19
-img_topic_unread_mine = topic_unread_mine.gif*18*19
-img_topic_unread_hot = topic_unread_hot.gif*18*19
-img_topic_unread_hot_mine = topic_unread_hot_mine.gif*18*19
-img_topic_unread_locked = topic_unread_locked.gif*18*19
-img_topic_unread_locked_mine = topic_unread_locked_mine.gif*18*19
-
-img_sticky_read = sticky_read.gif*18*19
-img_sticky_read_mine = sticky_read_mine.gif*18*19
-img_sticky_read_locked = sticky_read_locked.gif*18*19
-img_sticky_read_locked_mine = sticky_read_locked_mine.gif*18*19
-img_sticky_unread = sticky_unread.gif*18*19
-img_sticky_unread_mine = sticky_unread_mine.gif*18*19
-img_sticky_unread_locked = sticky_unread_locked.gif*18*19
-img_sticky_unread_locked_mine = sticky_unread_locked_mine.gif*18*19
-
-img_announce_read = announce_read.gif*18*19
-img_announce_read_mine = announce_read_mine.gif*18*19
-img_announce_read_locked = announce_read_locked.gif*18*19
-img_announce_read_locked_mine = announce_read_locked_mine.gif*18*19
-img_announce_unread = announce_unread.gif*18*19
-img_announce_unread_mine = announce_unread_mine.gif*18*19
-img_announce_unread_locked = announce_unread_locked.gif*18*19
-img_announce_unread_locked_mine = announce_unread_locked_mine.gif*18*19
-
-img_global_read = announce_read.gif*18*19
-img_global_read_mine = announce_read_mine.gif*18*19
-img_global_read_locked = announce_read_locked.gif*18*19
-img_global_read_locked_mine = announce_read_locked_mine.gif*18*19
-img_global_unread = announce_unread.gif*18*19
-img_global_unread_mine = announce_unread_mine.gif*18*19
-img_global_unread_locked = announce_unread_locked.gif*18*19
-img_global_unread_locked_mine = announce_unread_locked_mine.gif*18*19
-
-img_subforum_read =
-img_subforum_unread =
-
-img_pm_read = topic_read.gif*18*19
-img_pm_unread = topic_unread.gif*18*19
-
-img_icon_back_top =
-
-img_icon_post_target = icon_post_target.gif*9*12
-img_icon_post_target_unread = icon_post_target_unread.gif*9*12
-
-img_icon_topic_attach = icon_topic_attach.gif*18*14
-img_icon_topic_latest = icon_topic_latest.gif*9*18
-img_icon_topic_newest = icon_topic_newest.gif*9*18
-img_icon_topic_reported = icon_topic_reported.gif*18*19
-img_icon_topic_unapproved = icon_topic_unapproved.gif*18*19
-
-- 
cgit v1.2.1


From 4035f3f6c8fddf52d6d26a6ad2a76535205e41dd Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 4 Sep 2011 01:23:03 +0300
Subject: [feature/remove-imagesets] Changing subsilver

Removing imagesets. Changing subsilver

PHPBB3-10336
---
 .../styles/subsilver2/template/forumlist_body.html |   4 +-
 phpBB/styles/subsilver2/template/mcp_forum.html    |   4 +-
 phpBB/styles/subsilver2/template/mcp_post.html     |   4 +-
 phpBB/styles/subsilver2/template/mcp_topic.html    |   2 +-
 .../subsilver2/template/memberlist_body.html       |   6 +-
 .../subsilver2/template/memberlist_group.html      |   2 +-
 .../subsilver2/template/memberlist_leaders.html    |   2 +-
 .../subsilver2/template/memberlist_view.html       |  14 +-
 .../styles/subsilver2/template/overall_header.html |   3 +-
 .../styles/subsilver2/template/posting_review.html |   2 +-
 .../subsilver2/template/posting_topic_review.html  |   4 +-
 .../styles/subsilver2/template/search_results.html |   8 +-
 .../styles/subsilver2/template/simple_header.html  |   1 +
 .../subsilver2/template/ucp_main_subscribed.html   |   6 +-
 .../styles/subsilver2/template/ucp_pm_history.html |   2 +-
 .../subsilver2/template/ucp_pm_viewfolder.html     |   2 +-
 .../subsilver2/template/ucp_pm_viewmessage.html    |   4 +-
 .../styles/subsilver2/template/viewforum_body.html |  20 +-
 .../styles/subsilver2/template/viewtopic_body.html |  22 +-
 phpBB/styles/subsilver2/theme/en/stylesheet.css    | 116 ++++++
 phpBB/styles/subsilver2/theme/stylesheet.css       | 425 +++++++++++++++++++++
 21 files changed, 598 insertions(+), 55 deletions(-)
 create mode 100644 phpBB/styles/subsilver2/theme/en/stylesheet.css

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index 55ae288854..334fd7a968 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -56,9 +56,9 @@
 			<td class="row2" align="center"><p class="topicdetails">{forumrow.POSTS}</p></td>
 			<td class="row2" align="center" nowrap="nowrap">
 				<!-- IF forumrow.LAST_POST_TIME -->
-					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
+					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
-						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a><!-- ENDIF -->
+						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
 					</p>
 				<!-- ELSE -->
 					<p class="topicdetails">{L_NO_POSTS}</p>
diff --git a/phpBB/styles/subsilver2/template/mcp_forum.html b/phpBB/styles/subsilver2/template/mcp_forum.html
index 10c124b0e1..5d69e85391 100644
--- a/phpBB/styles/subsilver2/template/mcp_forum.html
+++ b/phpBB/styles/subsilver2/template/mcp_forum.html
@@ -31,10 +31,10 @@
 			<!-- ENDIF -->
 			<p class="topictitle">{NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a>
 			<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
-				<a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a>&nbsp;
+				<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.UNAPPROVED_IMG}</a>&nbsp;
 			<!-- ENDIF -->
 			<!-- IF topicrow.S_TOPIC_REPORTED and topicrow.U_MCP_REPORT -->
-				<a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
+				<a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
 			<!-- ENDIF -->
 			<!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE -->
 				[ <a href="{topicrow.U_DELETE_TOPIC}">{L_DELETE_SHADOW_TOPIC}</a> ]&nbsp;
diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html
index 771b1bc9e1..24d8682876 100644
--- a/phpBB/styles/subsilver2/template/mcp_post.html
+++ b/phpBB/styles/subsilver2/template/mcp_post.html
@@ -98,7 +98,7 @@
 </tr>
 <tr>
 	<td class="row1" colspan="2">
-	<!-- IF U_EDIT --><div class="gen" style="float: {S_CONTENT_FLOW_END};"><a href="{U_EDIT}">{EDIT_IMG}</a></div><!-- ENDIF -->
+	<!-- IF U_EDIT --><div class="gen" style="float: {S_CONTENT_FLOW_END};"><a href="{U_EDIT}" class="imageset">{EDIT_IMG}</a></div><!-- ENDIF -->
 
 	<div class="postbody">{POST_PREVIEW}</div>
 
@@ -173,7 +173,7 @@
 		<!-- BEGIN userrow -->
 			<!-- IF userrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 				<td><span class="gen"><!-- IF userrow.U_PROFILE --><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a><!-- ELSE -->{userrow.USERNAME}<!-- ENDIF --> [ {userrow.NUM_POSTS} {userrow.L_POST_S} ]</span></td>
-				<td align="center"><a href="{userrow.U_SEARCHPOSTS}">{SEARCH_IMG}</a></td>
+				<td align="center"><a href="{userrow.U_SEARCHPOSTS}" class="imageset">{SEARCH_IMG}</a></td>
 			</tr>
 		<!-- BEGINELSE -->
 			<tr class="row1">
diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html
index 13865d26ee..83c95c4ff9 100644
--- a/phpBB/styles/subsilver2/template/mcp_topic.html
+++ b/phpBB/styles/subsilver2/template/mcp_topic.html
@@ -79,7 +79,7 @@
 			</tr>
 			</table>
 		</td>
-		<td width="5%" align="center"><a href="{postrow.U_POST_DETAILS}">{INFO_IMG}</a></td>
+		<td width="5%" align="center"><a href="{postrow.U_POST_DETAILS}" class="imageset">{INFO_IMG}</a></td>
 	</tr>
 
 	<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html
index 78ffe49111..4c7af75ae5 100644
--- a/phpBB/styles/subsilver2/template/memberlist_body.html
+++ b/phpBB/styles/subsilver2/template/memberlist_body.html
@@ -70,9 +70,9 @@
 		<td class="genmed" align="center" nowrap="nowrap">&nbsp;{memberrow.JOINED}&nbsp;</td>
 		<td class="gen" align="center">{memberrow.POSTS}</td>
 		<td class="gen" align="center"><!-- IF memberrow.RANK_IMG -->{memberrow.RANK_IMG}<!-- ELSE -->{memberrow.RANK_TITLE}<!-- ENDIF --></td>
-		<td class="gen" align="center">&nbsp;<!-- IF memberrow.U_PM --><a href="{memberrow.U_PM}">{PM_IMG}</a><!-- ENDIF -->&nbsp;</td>
-		<td class="gen" align="center">&nbsp;<!-- IF memberrow.U_EMAIL --><a href="{memberrow.U_EMAIL}">{EMAIL_IMG}</a><!-- ENDIF -->&nbsp;</td>
-		<td class="gen" align="center">&nbsp;<!-- IF memberrow.U_WWW --><a href="{memberrow.U_WWW}">{WWW_IMG}</a><!-- ENDIF -->&nbsp;</td>
+		<td class="gen" align="center">&nbsp;<!-- IF memberrow.U_PM --><a href="{memberrow.U_PM}" class="imageset">{PM_IMG}</a><!-- ENDIF -->&nbsp;</td>
+		<td class="gen" align="center">&nbsp;<!-- IF memberrow.U_EMAIL --><a href="{memberrow.U_EMAIL}" class="imageset">{EMAIL_IMG}</a><!-- ENDIF -->&nbsp;</td>
+		<td class="gen" align="center">&nbsp;<!-- IF memberrow.U_WWW --><a href="{memberrow.U_WWW}" class="imageset">{WWW_IMG}</a><!-- ENDIF -->&nbsp;</td>
 		<!-- IF memberrow.S_PROFILE_FIELD1 -->
 			<!-- Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
 			<td class="gen" align="center">&nbsp;{memberrow.PROFILE_FIELD1_VALUE}</td>
diff --git a/phpBB/styles/subsilver2/template/memberlist_group.html b/phpBB/styles/subsilver2/template/memberlist_group.html
index 650868f810..f48b9811f0 100644
--- a/phpBB/styles/subsilver2/template/memberlist_group.html
+++ b/phpBB/styles/subsilver2/template/memberlist_group.html
@@ -7,7 +7,7 @@
 	<td class="row1" width="20%"><b class="genmed">{L_GROUP_NAME}:</b></td>
 	<td class="row2"><b class="gen"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR}"<!-- ENDIF -->>{GROUP_NAME}</b></td>
 <!-- IF AVATAR_IMG or RANK_IMG or GROUP_RANK or U_PM -->
-	<td class="row1" width="33%" rowspan="2" align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<br /><!-- ENDIF --><!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF --><!-- IF GROUP_RANK --><span class="gensmall">{GROUP_RANK}</span><br /><br /><!-- ENDIF --><!-- IF U_PM --><a href="{U_PM}">{PM_IMG}</a><!-- ENDIF --></td>
+	<td class="row1" width="33%" rowspan="2" align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<br /><!-- ENDIF --><!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF --><!-- IF GROUP_RANK --><span class="gensmall">{GROUP_RANK}</span><br /><br /><!-- ENDIF --><!-- IF U_PM --><a href="{U_PM}" class="imageset">{PM_IMG}</a><!-- ENDIF --></td>
 <!-- ENDIF -->
 </tr>
 <tr> 
diff --git a/phpBB/styles/subsilver2/template/memberlist_leaders.html b/phpBB/styles/subsilver2/template/memberlist_leaders.html
index 75fff9f98a..a4f38aafc4 100644
--- a/phpBB/styles/subsilver2/template/memberlist_leaders.html
+++ b/phpBB/styles/subsilver2/template/memberlist_leaders.html
@@ -27,7 +27,7 @@
 		<!-- ENDIF -->
 	&nbsp;</td>
 	<td class="gen" align="center"><!-- IF group.user.RANK_IMG -->{group.user.RANK_IMG}<!-- ELSE -->{group.user.RANK_TITLE}<!-- ENDIF --></td>
-	<td class="gen" align="center">&nbsp;<!-- IF group.user.U_PM --><a href="{group.user.U_PM}">{PM_IMG}</a><!-- ENDIF -->&nbsp;</td>
+	<td class="gen" align="center">&nbsp;<!-- IF group.user.U_PM --><a href="{group.user.U_PM}" class="imageset">{PM_IMG}</a><!-- ENDIF -->&nbsp;</td>
 </tr>
 <!-- BEGINELSE -->
 	<tr>
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 26c17f08e3..5d866214ce 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -108,33 +108,33 @@
 			<table width="100%" cellspacing="1" cellpadding="2" border="0">
 			<tr>
 				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_EMAIL_ADDRESS}: </td>
-				<td width="100%"><!-- IF U_EMAIL --><a href="{U_EMAIL}">{EMAIL_IMG}</a><!-- ENDIF --></td>
+				<td width="100%"><!-- IF U_EMAIL --><a href="{U_EMAIL}" class="imageset">{EMAIL_IMG}</a><!-- ENDIF --></td>
 			</tr>
 			<!-- IF U_PM -->
 				<tr>
 					<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_PM}: </td>
-					<td><a href="{U_PM}">{PM_IMG}</a></td>
+					<td><a href="{U_PM}" class="imageset">{PM_IMG}</a></td>
 				</tr>
 			<!-- ENDIF -->
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_MSNM}: </td>
-				<td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false">{MSN_IMG}</a><!-- ELSEIF USER_MSN -->{USER_MSN}<!-- ENDIF --></td>
+				<td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false" class="imageset">{MSN_IMG}</a><!-- ELSEIF USER_MSN -->{USER_MSN}<!-- ENDIF --></td>
 			</tr>
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_YIM}: </td>
-				<td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false">{YIM_IMG}</a><!-- ELSEIF USER_YIM -->{USER_YIM}<!-- ENDIF --></td>
+				<td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false" class="imageset">{YIM_IMG}</a><!-- ELSEIF USER_YIM -->{USER_YIM}<!-- ENDIF --></td>
 			</tr>
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_AIM}: </td>
-				<td><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false">{AIM_IMG}</a><!-- ELSEIF USER_AIM -->{USER_AIM}<!-- ENDIF --></td>
+				<td><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false" class="imageset">{AIM_IMG}</a><!-- ELSEIF USER_AIM -->{USER_AIM}<!-- ENDIF --></td>
 			</tr>
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_ICQ}: </td>
-				<td><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false">{ICQ_IMG}</a><!-- ELSEIF USER_ICQ -->{USER_ICQ}<!-- ENDIF --></td>
+				<td><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false" class="imageset">{ICQ_IMG}</a><!-- ELSEIF USER_ICQ -->{USER_ICQ}<!-- ENDIF --></td>
 			</tr>
 			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_JABBER}: </td>
-				<td><!-- IF U_JABBER --><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false">{JABBER_IMG}</a><!-- ELSEIF USER_JABBER -->{USER_JABBER_IMG}<!-- ENDIF --></td>
+				<td><!-- IF U_JABBER --><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false" class="imageset">{JABBER_IMG}</a><!-- ELSEIF USER_JABBER -->{USER_JABBER_IMG}<!-- ENDIF --></td>
 			</tr>
 			</table>
 		</td>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 4fca1b6c09..5d5489338a 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -18,6 +18,7 @@
 <!-- ENDIF -->
 
 <link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
+<link rel="stylesheet" href="{T_STYLESHEET_LANG_LINK}" type="text/css" />
 
 <script type="text/javascript">
 // <![CDATA[
@@ -142,7 +143,7 @@ function marklist(id, name, state)
 	<div id="logodesc">
 		<table width="100%" cellspacing="0">
 		<tr>
-			<td><a href="{U_INDEX}">{SITE_LOGO_IMG}</a></td>
+			<td><a href="{U_INDEX}" class="imageset">{SITE_LOGO_IMG}</a></td>
 			<td width="100%" align="center"><h1>{SITENAME}</h1><span class="gen">{SITE_DESCRIPTION}</span></td>
 		</tr>
 		</table>
diff --git a/phpBB/styles/subsilver2/template/posting_review.html b/phpBB/styles/subsilver2/template/posting_review.html
index 1647ef595e..87266da44c 100644
--- a/phpBB/styles/subsilver2/template/posting_review.html
+++ b/phpBB/styles/subsilver2/template/posting_review.html
@@ -77,7 +77,7 @@
 							<table width="100%" cellspacing="0" cellpadding="0" border="0">
 							<tr valign="middle">
 								<td width="100%">&nbsp;</td>
-								<td width="10" nowrap="nowrap"><!-- IF S_IS_BOT -->{post_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{post_review_row.U_MINI_POST}">{post_review_row.MINI_POST_IMG}</a><!-- ENDIF --></td>
+								<td width="10" nowrap="nowrap"><!-- IF S_IS_BOT -->{post_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{post_review_row.U_MINI_POST}" class="imageset">{post_review_row.MINI_POST_IMG}</a><!-- ENDIF --></td>
 								<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {post_review_row.POST_DATE}</td>
 							</tr>
 							</table>
diff --git a/phpBB/styles/subsilver2/template/posting_topic_review.html b/phpBB/styles/subsilver2/template/posting_topic_review.html
index a4365532d4..2bfa95f3d4 100644
--- a/phpBB/styles/subsilver2/template/posting_topic_review.html
+++ b/phpBB/styles/subsilver2/template/posting_topic_review.html
@@ -36,7 +36,7 @@
 						<td>&nbsp;</td>
 						<td class="gensmall" valign="middle" nowrap="nowrap"><b>{L_POST_SUBJECT}:</b>&nbsp;</td>
 						<td class="gensmall" width="100%" valign="middle">{topic_review_row.POST_SUBJECT}</td>
-						<td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE --><a href="#" onclick="addquote({topic_review_row.POST_ID},'{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}'); return false;">{QUOTE_IMG}</a><!-- ENDIF --></td>
+						<td valign="top" nowrap="nowrap">&nbsp;<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE --><a href="#" onclick="addquote({topic_review_row.POST_ID},'{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}'); return false;" class="imageset">{QUOTE_IMG}</a><!-- ENDIF --></td>
 					</tr>
 					</table>
 				</td>
@@ -81,7 +81,7 @@
 							<table width="100%" cellspacing="0">
 							<tr valign="middle">
 								<td width="100%" align="{S_CONTENT_FLOW_BEGIN}"><span class="gensmall"><!-- IF topic_review_row.U_MCP_DETAILS -->[ <a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></span></td>
-								<td width="10" nowrap="nowrap"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --></td>
+								<td width="10" nowrap="nowrap"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}" class="imageset">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --></td>
 								<td class="gensmall" nowrap="nowrap"><b>{L_POSTED}:</b> {topic_review_row.POST_DATE}</td>
 							</tr>
 							</table>
diff --git a/phpBB/styles/subsilver2/template/search_results.html b/phpBB/styles/subsilver2/template/search_results.html
index 282b0f864b..d8a1879ca7 100644
--- a/phpBB/styles/subsilver2/template/search_results.html
+++ b/phpBB/styles/subsilver2/template/search_results.html
@@ -34,13 +34,13 @@
 			<!-- ENDIF -->
 			</td>
 			<td class="row1">
-				<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF -->
+				<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF -->
 				{searchresults.ATTACH_ICON_IMG} <a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a>
 				<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED -->
-					<a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a>&nbsp;
+					<a href="{searchresults.U_MCP_QUEUE}" class="imageset">{searchresults.UNAPPROVED_IMG}</a>&nbsp;
 				<!-- ENDIF -->
 				<!-- IF searchresults.S_TOPIC_REPORTED -->
-					<a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
+					<a href="{searchresults.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
 				<!-- ENDIF -->
 				<!-- IF searchresults.PAGINATION -->
 					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {searchresults.PAGINATION} ] </p>
@@ -53,7 +53,7 @@
 			<td class="row1" width="120" align="center">
 				<p class="topicdetails">{searchresults.LAST_POST_TIME}</p>
 				<p class="topicdetails">{searchresults.LAST_POST_AUTHOR_FULL}
-					<a href="{searchresults.U_LAST_POST}">{LAST_POST_IMG}</a>
+					<a href="{searchresults.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a>
 				</p>
 			</td>
 		</tr>
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
index 79236434f2..43ca16ed87 100644
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ b/phpBB/styles/subsilver2/template/simple_header.html
@@ -8,6 +8,7 @@
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
 <link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
+<link rel="stylesheet" href="{T_STYLESHEET_LANG_LINK}" type="text/css" />
 </head>
 
 <body class="{S_CONTENT_DIRECTION}">
diff --git a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html
index 43f98a4334..42a452549b 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html
@@ -17,7 +17,7 @@
 		<!-- IF forumrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="padding: 4px;" width="20" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
 			<td style="padding: 4px;" width="100%"><p class="topictitle"><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></p></td>
-			<td class="gensmall" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br />{forumrow.LAST_POST_AUTHOR_FULL} <a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></td>
+			<td class="gensmall" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br />{forumrow.LAST_POST_AUTHOR_FULL} <a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></td>
 			<td style="padding: 4px;"> <input type="checkbox" class="radio" name="f[{forumrow.FORUM_ID}]" /> </td>
 		</tr>
 	<!-- BEGINELSE -->
@@ -50,7 +50,7 @@
 		<!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
 			<td style="padding: 4px;" width="100%" valign="top">
-				<p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p>
+				<p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p>
 				<!-- IF topicrow.S_GLOBAL_TOPIC --><span class="gensmall">{L_GLOBAL_ANNOUNCEMENT}</span><!-- ELSE --><span class="gensmall"><b>{L_FORUM}: </b><a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span><!-- ENDIF -->
 				<!-- IF topicrow.PAGINATION -->
 					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p>
@@ -59,7 +59,7 @@
 			<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap">
 				<p class="topicdetails">{topicrow.LAST_POST_TIME}</p>
 				<p class="topicdetails">{topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a>
+					<a href="{topicrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a>
 				</p>
 			</td>
 			<td style="padding: 4px;"> <input type="checkbox" class="radio" name="t[{topicrow.TOPIC_ID}]" /> </td>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html
index 8754acaaa2..f24474e85c 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_history.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_history.html
@@ -59,7 +59,7 @@
 
 		<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td class="gensmall"><a href="{history_row.U_VIEW_MESSAGE}">{L_VIEW_PM}</a></td>
-			<td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF history_row.U_PROFILE --><a href="{history_row.U_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_EMAIL --><a href="{history_row.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE --><a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}'); return false;"<!-- ENDIF -->>{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_POST_REPLY_PM --><a href="{history_row.U_POST_REPLY_PM}">{REPLY_IMG}</a><!-- ENDIF -->&nbsp;</div></td>
+			<td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF history_row.U_PROFILE --><a href="{history_row.U_PROFILE}" class="imageset">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_EMAIL --><a href="{history_row.U_EMAIL}" class="imageset">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE --><a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}'); return false;"<!-- ENDIF --> class="imageset">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_POST_REPLY_PM --><a href="{history_row.U_POST_REPLY_PM}" class="imageset">{REPLY_IMG}</a><!-- ENDIF -->&nbsp;</div></td>
 		</tr>
 		<tr>
 			<td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html b/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
index f0b076edb2..64c923e72c 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
@@ -82,7 +82,7 @@
 					<a href="{messagerow.U_VIEW_PM}">{messagerow.SUBJECT}</a>
 				<!-- ENDIF -->
 				<!-- IF messagerow.S_PM_REPORTED -->
-					<a href="{messagerow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
+					<a href="{messagerow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
 				<!-- ENDIF -->
 				<!-- IF messagerow.S_AUTHOR_DELETED -->
 					<br /><em class="gensmall">{L_PM_FROM_REMOVED_AUTHOR}</em>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
index 4971506a6d..faaa3f9593 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
@@ -93,7 +93,7 @@
 
 				<table width="100%" cellspacing="0">
 				<tr valign="middle">
-					<td class="gensmall" align="{S_CONTENT_FLOW_END}"> <!-- IF U_REPORT --><a href="{U_REPORT}">{REPORT_IMG}</a> <!-- ENDIF --><!-- IF U_DELETE --><a href="{U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF --></td>
+					<td class="gensmall" align="{S_CONTENT_FLOW_END}"> <!-- IF U_REPORT --><a href="{U_REPORT}" class="imageset">{REPORT_IMG}</a> <!-- ENDIF --><!-- IF U_DELETE --><a href="{U_DELETE}" class="imageset">{DELETE_IMG}</a> <!-- ENDIF --></td>
 				</tr>
 				</table>
 
@@ -104,7 +104,7 @@
 </tr>
 
 <tr class="row1">
-	<td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF U_MESSAGE_AUTHOR --><a href="{U_MESSAGE_AUTHOR}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF U_EMAIL --><a href="{U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF U_EDIT --><a href="{U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> <!-- IF U_QUOTE --><a href="{U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF U_POST_REPLY_PM --><a href="{U_POST_REPLY_PM}">{REPLY_IMG}</a><!-- ENDIF -->&nbsp;</div></td>
+	<td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF U_MESSAGE_AUTHOR --><a href="{U_MESSAGE_AUTHOR}" class="imageset">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF U_EMAIL --><a href="{U_EMAIL}" class="imageset">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF U_EDIT --><a href="{U_EDIT}" class="imageset">{EDIT_IMG}</a> <!-- ENDIF --> <!-- IF U_QUOTE --><a href="{U_QUOTE}" class="imageset">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF U_POST_REPLY_PM --><a href="{U_POST_REPLY_PM}" class="imageset">{REPLY_IMG}</a><!-- ENDIF -->&nbsp;</div></td>
 </tr>
 
 <tr>
diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html
index 5c20b84541..f132185716 100644
--- a/phpBB/styles/subsilver2/template/viewforum_body.html
+++ b/phpBB/styles/subsilver2/template/viewforum_body.html
@@ -40,13 +40,13 @@
 				<td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
 			<!-- ENDIF -->
 			<td class="row1">
-				<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF -->
+				<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF -->
 				{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}: {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}"class="topictitle">{topicrow.TOPIC_TITLE}</a>
 				<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
-					<a href="{topicrow.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a>&nbsp;
+					<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;
 				<!-- ENDIF -->
 				<!-- IF topicrow.S_TOPIC_REPORTED -->
-					<a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
+					<a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
 				<!-- ENDIF -->
 				<!-- IF topicrow.PAGINATION -->
 					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p>
@@ -58,7 +58,7 @@
 			<td class="row1" width="140" align="center">
 				<p class="topicdetails" style="white-space: nowrap;">{topicrow.LAST_POST_TIME}</p>
 				<p class="topicdetails">{topicrow.LAST_POST_AUTHOR_FULL}
-					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a><!-- ENDIF -->
+					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
 				</p>
 			</td>
 		</tr>
@@ -137,7 +137,7 @@
 		<table width="100%" cellspacing="1">
 		<tr>
 			<!-- IF S_DISPLAY_POST_INFO and not S_IS_BOT -->
-				<td align="{S_CONTENT_FLOW_BEGIN}" valign="middle"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></td>
+				<td align="{S_CONTENT_FLOW_BEGIN}" valign="middle"><a href="{U_POST_NEW_TOPIC}" class="imageset">{POST_IMG}</a></td>
 			<!-- ENDIF -->
 			<!-- IF TOTAL_TOPICS -->
 				<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
@@ -191,13 +191,13 @@
 					<td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
 				<!-- ENDIF -->
 				<td class="row1">
-					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF -->
+					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF -->
 					{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}: {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
 					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
-						<a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a>&nbsp;
+						<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.UNAPPROVED_IMG}</a>&nbsp;
 					<!-- ENDIF -->
 					<!-- IF topicrow.S_TOPIC_REPORTED -->
-						<a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
+						<a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
 					<!-- ENDIF -->
 					<!-- IF topicrow.PAGINATION -->
 						<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p>
@@ -210,7 +210,7 @@
 				<td class="row1" width="140" align="center">
 					<p class="topicdetails" style="white-space: nowrap;">{topicrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{topicrow.LAST_POST_AUTHOR_FULL}
-						<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a><!-- ENDIF -->
+						<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
 					</p>
 				</td>
 			</tr>
@@ -245,7 +245,7 @@
 		<table width="100%" cellspacing="1">
 		<tr>
 			<!-- IF S_DISPLAY_POST_INFO and not S_IS_BOT -->
-				<td align="{S_CONTENT_FLOW_BEGIN}" valign="middle"><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a></td>
+				<td align="{S_CONTENT_FLOW_BEGIN}" valign="middle"><a href="{U_POST_NEW_TOPIC}" class="imageset">{POST_IMG}</a></td>
 			<!-- ENDIF -->
 			<!-- IF TOTAL_TOPICS -->
 				<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index 56e03e344c..b8387482bf 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -33,8 +33,8 @@
 	<tr>
 		<td align="{S_CONTENT_FLOW_BEGIN}" valign="middle" nowrap="nowrap">
 		<!-- IF not S_IS_BOT -->
-			<!-- IF S_DISPLAY_POST_INFO --><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a>&nbsp;<!-- ENDIF -->
-			<!-- IF S_DISPLAY_REPLY_INFO --><a href="{U_POST_REPLY_TOPIC}">{REPLY_IMG}</a><!-- ENDIF -->
+			<!-- IF S_DISPLAY_POST_INFO --><a href="{U_POST_NEW_TOPIC}" class="imageset">{POST_IMG}</a>&nbsp;<!-- ENDIF -->
+			<!-- IF S_DISPLAY_REPLY_INFO --><a href="{U_POST_REPLY_TOPIC}" class="imageset">{REPLY_IMG}</a><!-- ENDIF -->
 		<!-- ENDIF -->
 		</td>
 		<!-- IF TOTAL_POSTS -->
@@ -90,7 +90,7 @@
 					<!-- ENDIF -->
 						<td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td>
 						<!-- IF S_DISPLAY_RESULTS -->
-							<td dir="ltr">{POLL_LEFT_CAP_IMG}{poll_option.POLL_OPTION_IMG}{POLL_RIGHT_CAP_IMG}</td>
+							<td dir="ltr">{POLL_LEFT_CAP_IMG}<span class="imageset poll_center" style="width: {poll_option.POLL_OPTION_WIDTH}px; background-repeat: repeat-x;">{poll_option.POLL_OPTION_PERCENT}</span>{POLL_RIGHT_CAP_IMG}</td>
 							<td class="gen" align="{S_CONTENT_FLOW_END}"><b>&nbsp;{poll_option.POLL_OPTION_PERCENT}&nbsp;</b></td>
 							<td class="gen" align="center">[ {poll_option.POLL_OPTION_RESULT} ]</td>
 							<!-- IF poll_option.POLL_OPTION_VOTED -->
@@ -150,7 +150,7 @@
 				<!-- IF postrow.POST_ICON_IMG -->
 					<td><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" title="" /></td>
 				<!-- ENDIF -->
-					<td class="gensmall" width="100%"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<b>{L_POST_SUBJECT}:</b> <a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></div><div style="float: {S_CONTENT_FLOW_END};"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><b>{L_POSTED}:</b> {postrow.POST_DATE}&nbsp;</div></td>
+					<td class="gensmall" width="100%"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<b>{L_POST_SUBJECT}:</b> <a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></div><div style="float: {S_CONTENT_FLOW_END};"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}" class="imageset">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><b>{L_POSTED}:</b> {postrow.POST_DATE}&nbsp;</div></td>
 				</tr>
 				</table>
 			</td>
@@ -268,10 +268,10 @@
 						<tr valign="middle">
 							<td class="gensmall" align="{S_CONTENT_FLOW_END}">
 							<!-- IF not S_IS_BOT -->
-								<!-- IF postrow.U_REPORT --><a href="{postrow.U_REPORT}">{REPORT_IMG}</a> <!-- ENDIF --> 
-								<!-- IF postrow.U_INFO --><a href="{postrow.U_INFO}">{INFO_IMG}</a> <!-- ENDIF --> 
-								<!-- IF postrow.U_WARN --><a href="{postrow.U_WARN}">{WARN_IMG}</a> <!-- ENDIF --> 
-								<!-- IF postrow.U_DELETE --><a href="{postrow.U_DELETE}">{DELETE_IMG}</a> <!-- ENDIF -->
+								<!-- IF postrow.U_REPORT --><a href="{postrow.U_REPORT}" class="imageset">{REPORT_IMG}</a> <!-- ENDIF --> 
+								<!-- IF postrow.U_INFO --><a href="{postrow.U_INFO}" class="imageset">{INFO_IMG}</a> <!-- ENDIF --> 
+								<!-- IF postrow.U_WARN --><a href="{postrow.U_WARN}" class="imageset">{WARN_IMG}</a> <!-- ENDIF --> 
+								<!-- IF postrow.U_DELETE --><a href="{postrow.U_DELETE}" class="imageset">{DELETE_IMG}</a> <!-- ENDIF -->
 							<!-- ENDIF -->
 							</td>
 						</tr>
@@ -285,7 +285,7 @@
 		<!-- IF postrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 
 			<td class="profile"><strong><a href="#wrapheader">{L_BACK_TO_TOP}</a></strong></td>
-			<td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_PM --><a href="{postrow.U_PM}">{PM_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EMAIL --><a href="{postrow.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF not S_IS_BOT --><!-- IF postrow.U_EDIT --><a href="{postrow.U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_QUOTE --><a href="{postrow.U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- ENDIF -->&nbsp;</div></td>
+			<td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}" class="imageset">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_PM --><a href="{postrow.U_PM}" class="imageset">{PM_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_EMAIL --><a href="{postrow.U_EMAIL}" class="imageset">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF not S_IS_BOT --><!-- IF postrow.U_EDIT --><a href="{postrow.U_EDIT}" class="imageset">{EDIT_IMG}</a> <!-- ENDIF --> <!-- IF postrow.U_QUOTE --><a href="{postrow.U_QUOTE}" class="imageset">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- ENDIF -->&nbsp;</div></td>
 	<!-- ENDIF -->
 		</tr>
 
@@ -307,8 +307,8 @@
 	<tr>
 		<td align="{S_CONTENT_FLOW_BEGIN}" valign="middle" nowrap="nowrap">
 		<!-- IF not S_IS_BOT -->
-			<!-- IF S_DISPLAY_POST_INFO --><a href="{U_POST_NEW_TOPIC}">{POST_IMG}</a>&nbsp;<!-- ENDIF -->
-			<!-- IF S_DISPLAY_REPLY_INFO --><a href="{U_POST_REPLY_TOPIC}">{REPLY_IMG}</a><!-- ENDIF -->
+			<!-- IF S_DISPLAY_POST_INFO --><a href="{U_POST_NEW_TOPIC}" class="imageset">{POST_IMG}</a>&nbsp;<!-- ENDIF -->
+			<!-- IF S_DISPLAY_REPLY_INFO --><a href="{U_POST_REPLY_TOPIC}" class="imageset">{REPLY_IMG}</a><!-- ENDIF -->
 		<!-- ENDIF -->
 		</td>
 		<!-- IF TOTAL_POSTS -->
diff --git a/phpBB/styles/subsilver2/theme/en/stylesheet.css b/phpBB/styles/subsilver2/theme/en/stylesheet.css
new file mode 100644
index 0000000000..563492d4fc
--- /dev/null
+++ b/phpBB/styles/subsilver2/theme/en/stylesheet.css
@@ -0,0 +1,116 @@
+/* EN Language Pack */
+.imageset.icon_contact_aim {
+	background-image: url("./icon_contact_aim.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_email {
+	background-image: url("./icon_contact_email.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_icq {
+	background-image: url("./icon_contact_icq.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_jabber {
+	background-image: url("./icon_contact_jabber.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_msnm {
+	background-image: url("./icon_contact_msnm.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_pm {
+	background-image: url("./icon_contact_pm.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_yahoo {
+	background-image: url("./icon_contact_yahoo.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_www {
+	background-image: url("./icon_contact_www.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_post_delete {
+	background-image: url("./icon_post_delete.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_post_edit {
+	background-image: url("./icon_post_edit.gif");
+	padding-left: 90px;
+	padding-top: 20px;
+}
+.imageset.icon_post_info {
+	background-image: url("./icon_post_info.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_post_quote {
+	background-image: url("./icon_post_quote.gif");
+	padding-left: 90px;
+	padding-top: 20px;
+}
+.imageset.icon_post_report {
+	background-image: url("./icon_post_report.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_user_online {
+	background-image: url("./icon_user_online.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_user_offline {
+	background-image: url("./icon_user_offline.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_user_profile {
+	background-image: url("./icon_user_profile.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_user_search {
+	background-image: url("./icon_user_search.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_user_warn {
+	background-image: url("./icon_user_warn.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.button_pm_new {
+	background-image: url("./button_pm_new.gif");
+	padding-left: 97px;
+	padding-top: 27px;
+}
+.imageset.button_pm_reply {
+	background-image: url("./button_pm_reply.gif");
+	padding-left: 90px;
+	padding-top: 20px;
+}
+.imageset.button_topic_locked {
+	background-image: url("./button_topic_locked.gif");
+	padding-left: 97px;
+	padding-top: 27px;
+}
+.imageset.button_topic_new {
+	background-image: url("./button_topic_new.gif");
+	padding-left: 97px;
+	padding-top: 27px;
+}
+.imageset.button_topic_reply {
+	background-image: url("./button_topic_reply.gif");
+	padding-left: 97px;
+	padding-top: 27px;
+}
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index c2b6718d87..a753c914ba 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -674,3 +674,428 @@ pre {
 .username-coloured {
 	font-weight: bold;
 }
+
+
+/* Former imageset */
+span.imageset {
+	display: inline-block;
+	background: transparent none 0 0 no-repeat;
+	margin: 0;
+	padding: 0;
+	width: 0;
+	height: 0;
+	overflow: hidden;
+}
+a.imageset {
+	text-decoration: none !important;
+}
+
+/* Global imageset items */
+.imageset.site_logo {
+	background-image: url("./images/site_logo.gif");
+	padding-left: 170px;
+	padding-top: 94px;
+}
+.imageset.upload_bar {
+	background-image: url("./images/upload_bar.gif");
+	padding-left: 280px;
+	padding-top: 16px;
+}
+.imageset.poll_left {
+	background-image: url("./images/poll_left.gif");
+	padding-left: 4px;
+	padding-top: 12px;
+}
+.imageset.poll_center {
+	background-image: url("./images/poll_center.gif");
+	padding-left: 1px;
+	padding-top: 12px;
+}
+.imageset.poll_right {
+	background-image: url("./images/poll_right.gif");
+	padding-left: 4px;
+	padding-top: 12px;
+}
+.imageset.forum_link {
+	background-image: url("./images/forum_link.gif");
+	padding-left: 46px;
+	padding-top: 25px;
+}
+.imageset.forum_read {
+	background-image: url("./images/forum_read.gif");
+	padding-left: 46px;
+	padding-top: 25px;
+}
+.imageset.forum_read_locked {
+	background-image: url("./images/forum_read_locked.gif");
+	padding-left: 46px;
+	padding-top: 25px;
+}
+.imageset.forum_read_subforum {
+	background-image: url("./images/forum_read_subforum.gif");
+	padding-left: 46px;
+	padding-top: 25px;
+}
+.imageset.forum_unread {
+	background-image: url("./images/forum_unread.gif");
+	padding-left: 46px;
+	padding-top: 25px;
+}
+.imageset.forum_unread_locked {
+	background-image: url("./images/forum_unread_locked.gif");
+	padding-left: 46px;
+	padding-top: 25px;
+}
+.imageset.forum_unread_subforum {
+	background-image: url("./images/forum_unread_subforum.gif");
+	padding-left: 46px;
+	padding-top: 25px;
+}
+.imageset.topic_moved {
+	background-image: url("./images/topic_moved.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_read {
+	background-image: url("./images/topic_read.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_read_mine {
+	background-image: url("./images/topic_read_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_read_hot {
+	background-image: url("./images/topic_read_hot.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_read_hot_mine {
+	background-image: url("./images/topic_read_hot_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_read_locked {
+	background-image: url("./images/topic_read_locked.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_read_locked_mine {
+	background-image: url("./images/topic_read_locked_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_unread {
+	background-image: url("./images/topic_unread.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_unread_mine {
+	background-image: url("./images/topic_unread_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_unread_hot {
+	background-image: url("./images/topic_unread_hot.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_unread_hot_mine {
+	background-image: url("./images/topic_unread_hot_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_unread_locked {
+	background-image: url("./images/topic_unread_locked.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.topic_unread_locked_mine {
+	background-image: url("./images/topic_unread_locked_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.sticky_read {
+	background-image: url("./images/sticky_read.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.sticky_read_mine {
+	background-image: url("./images/sticky_read_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.sticky_read_locked {
+	background-image: url("./images/sticky_read_locked.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.sticky_read_locked_mine {
+	background-image: url("./images/sticky_read_locked_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.sticky_unread {
+	background-image: url("./images/sticky_unread.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.sticky_unread_mine {
+	background-image: url("./images/sticky_unread_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.sticky_unread_locked {
+	background-image: url("./images/sticky_unread_locked.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.sticky_unread_locked_mine {
+	background-image: url("./images/sticky_unread_locked_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.announce_read {
+	background-image: url("./images/announce_read.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.announce_read_mine {
+	background-image: url("./images/announce_read_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.announce_read_locked {
+	background-image: url("./images/announce_read_locked.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.announce_read_locked_mine {
+	background-image: url("./images/announce_read_locked_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.announce_unread {
+	background-image: url("./images/announce_unread.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.announce_unread_mine {
+	background-image: url("./images/announce_unread_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.announce_unread_locked {
+	background-image: url("./images/announce_unread_locked.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.announce_unread_locked_mine {
+	background-image: url("./images/announce_unread_locked_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.global_read {
+	background-image: url("./images/announce_read.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.global_read_mine {
+	background-image: url("./images/announce_read_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.global_read_locked {
+	background-image: url("./images/announce_read_locked.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.global_read_locked_mine {
+	background-image: url("./images/announce_read_locked_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.global_unread {
+	background-image: url("./images/announce_unread.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.global_unread_mine {
+	background-image: url("./images/announce_unread_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.global_unread_locked {
+	background-image: url("./images/announce_unread_locked.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.global_unread_locked_mine {
+	background-image: url("./images/announce_unread_locked_mine.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.pm_read {
+	background-image: url("./images/topic_read.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.pm_unread {
+	background-image: url("./images/topic_unread.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.icon_post_target {
+	background-image: url("./images/icon_post_target.gif");
+	padding-left: 12px;
+	padding-top: 9px;
+}
+.imageset.icon_post_target_unread {
+	background-image: url("./images/icon_post_target_unread.gif");
+	padding-left: 12px;
+	padding-top: 9px;
+}
+.imageset.icon_topic_attach {
+	background-image: url("./images/icon_topic_attach.gif");
+	padding-left: 14px;
+	padding-top: 18px;
+}
+.imageset.icon_topic_latest {
+	background-image: url("./images/icon_topic_latest.gif");
+	padding-left: 18px;
+	padding-top: 9px;
+}
+.imageset.icon_topic_newest {
+	background-image: url("./images/icon_topic_newest.gif");
+	padding-left: 18px;
+	padding-top: 9px;
+}
+.imageset.icon_topic_reported {
+	background-image: url("./images/icon_topic_reported.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+.imageset.icon_topic_unapproved {
+	background-image: url("./images/icon_topic_unapproved.gif");
+	padding-left: 19px;
+	padding-top: 18px;
+}
+
+
+/* English images for fallback */
+.imageset.icon_contact_aim {
+	background-image: url("./en/icon_contact_aim.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_email {
+	background-image: url("./en/icon_contact_email.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_icq {
+	background-image: url("./en/icon_contact_icq.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_jabber {
+	background-image: url("./en/icon_contact_jabber.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_msnm {
+	background-image: url("./en/icon_contact_msnm.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_pm {
+	background-image: url("./en/icon_contact_pm.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_yahoo {
+	background-image: url("./en/icon_contact_yahoo.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_contact_www {
+	background-image: url("./en/icon_contact_www.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_post_delete {
+	background-image: url("./en/icon_post_delete.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_post_edit {
+	background-image: url("./en/icon_post_edit.gif");
+	padding-left: 90px;
+	padding-top: 20px;
+}
+.imageset.icon_post_info {
+	background-image: url("./en/icon_post_info.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_post_quote {
+	background-image: url("./en/icon_post_quote.gif");
+	padding-left: 90px;
+	padding-top: 20px;
+}
+.imageset.icon_post_report {
+	background-image: url("./en/icon_post_report.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.icon_user_online {
+	background-image: url("./en/icon_user_online.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_user_offline {
+	background-image: url("./en/icon_user_offline.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_user_profile {
+	background-image: url("./en/icon_user_profile.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_user_search {
+	background-image: url("./en/icon_user_search.gif");
+	padding-left: 72px;
+	padding-top: 20px;
+}
+.imageset.icon_user_warn {
+	background-image: url("./en/icon_user_warn.gif");
+	padding-left: 20px;
+	padding-top: 20px;
+}
+.imageset.button_pm_new {
+	background-image: url("./en/button_pm_new.gif");
+	padding-left: 97px;
+	padding-top: 27px;
+}
+.imageset.button_pm_reply {
+	background-image: url("./en/button_pm_reply.gif");
+	padding-left: 90px;
+	padding-top: 20px;
+}
+.imageset.button_topic_locked {
+	background-image: url("./en/button_topic_locked.gif");
+	padding-left: 97px;
+	padding-top: 27px;
+}
+.imageset.button_topic_new {
+	background-image: url("./en/button_topic_new.gif");
+	padding-left: 97px;
+	padding-top: 27px;
+}
+.imageset.button_topic_reply {
+	background-image: url("./en/button_topic_reply.gif");
+	padding-left: 97px;
+	padding-top: 27px;
+}
-- 
cgit v1.2.1


From e38fd2b9f29b0a39e1a05139c293ce7a20447734 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 20 Sep 2011 22:56:53 +0300
Subject: [ticket/10371] Removing last mentions of imageset

Removing last mentions of imageset

PHPBB3-10371
---
 phpBB/styles/subsilver2/theme/theme.cfg | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg
index 9e39133bd9..207e1b6650 100644
--- a/phpBB/styles/subsilver2/theme/theme.cfg
+++ b/phpBB/styles/subsilver2/theme/theme.cfg
@@ -22,14 +22,3 @@
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
 version = 3.1.0-dev
-
-# Some configuration options
-
-#
-# You have to turn this option on if you want to use the
-# path template variables ({T_IMAGESET_PATH} for example) within
-# your css file.
-# This is mostly the case if you want to use language specific
-# images within your css file.
-#
-parse_css_file = off
-- 
cgit v1.2.1


From b1df91db806f814d24948db773c27f15a731147e Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Tue, 20 Sep 2011 19:29:36 +0100
Subject: [feature/remove-db-styles] Remove parse_css_file option from themes.

PHPBB3-9741
---
 phpBB/styles/subsilver2/theme/theme.cfg | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg
index 207e1b6650..c560dabae2 100644
--- a/phpBB/styles/subsilver2/theme/theme.cfg
+++ b/phpBB/styles/subsilver2/theme/theme.cfg
@@ -14,9 +14,6 @@
 # the value, then enclose the value with single or double quotes.
 # Single and double quotes do not need to be escaped.
 #
-# Available and used values:
-# parse_css_file
-#
 
 # General Information about this theme
 name = subsilver2
-- 
cgit v1.2.1


From 56c6476233646e7c735aa4e3b98c4a6b62df5c7d Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 25 Sep 2011 15:12:56 -0700
Subject: [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.

PHPBB3-10390
---
 phpBB/styles/subsilver2/template/overall_footer.html | 3 ++-
 phpBB/styles/subsilver2/template/simple_footer.html  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 3cdd071211..9b0b95372e 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -8,7 +8,8 @@
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
 </div>
 
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index f03d1094f2..b51be3ac4c 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -5,7 +5,8 @@
 	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group</span>
 </div>
 
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script>
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 
 </body>
 </html>
-- 
cgit v1.2.1


From dee836315ca0d449d252929313e30fb64e452fe4 Mon Sep 17 00:00:00 2001
From: maelsoucaze <maelsoucaze@phpbb.com>
Date: Sat, 29 Oct 2011 17:20:36 +0200
Subject: [ticket/10254] Remove style names from themes and fix some
 informations on it.

PHPBB3-10254
---
 phpBB/styles/subsilver2/theme/stylesheet.css | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index c2b6718d87..b497620573 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1,14 +1,13 @@
-/*  phpBB 3.0 Style Sheet
+/*  phpBB3 Style Sheet
     --------------------------------------------------------------
-	Style name:		subsilver2
-	Based on style:	subSilver (the default phpBB 2 style)
-	Original author:	subBlue ( http://www.subBlue.com/ )
-	Modified by:		psoTFX and the phpBB team ( http://www.phpbb.com )
+	Style name:			subsilver2 (the default phpBB 3.0.x style)
+	Based on style:		subSilver (the default phpBB 2.0.x style)
+	Original author:	Tom Beddard ( http://www.subblue.com/ )
+	Modified by:		phpBB Group ( http://www.phpbb.com/ )
 	
-	This is an alternative style for phpBB3 for those wishing to stay with
-	the familiar subSilver style of phpBB version 2.x
-	
-	Copyright 2006 phpBB Group ( http://www.phpbb.com/ )
+	NOTE: This page was generated by phpBB, the free open-source bulletin board package.
+		  The phpBB Group is not responsible for the content of this page and forum.
+		  For more information about phpBB please visit http://www.phpbb.com/
     --------------------------------------------------------------
 */
 
-- 
cgit v1.2.1


From c79992d1cc06a6133b67117262685d8b4b7ae51b Mon Sep 17 00:00:00 2001
From: maelsoucaze <maelsoucaze@phpbb.com>
Date: Sat, 29 Oct 2011 19:09:54 +0200
Subject: [ticket/10254] Remove subsilver2 as default style on theme.

PHPBB3-10254
---
 phpBB/styles/subsilver2/theme/stylesheet.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index b497620573..e658994de4 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1,6 +1,6 @@
 /*  phpBB3 Style Sheet
     --------------------------------------------------------------
-	Style name:			subsilver2 (the default phpBB 3.0.x style)
+	Style name:			subsilver2
 	Based on style:		subSilver (the default phpBB 2.0.x style)
 	Original author:	Tom Beddard ( http://www.subblue.com/ )
 	Modified by:		phpBB Group ( http://www.phpbb.com/ )
-- 
cgit v1.2.1


From cf044c363b788ab77cf1539af13c4c035ba0b970 Mon Sep 17 00:00:00 2001
From: maelsoucaze <maelsoucaze@phpbb.com>
Date: Thu, 10 Nov 2011 16:31:47 +0100
Subject: [ticket/10254] Removing the subsilver2 NOTE, incompatible with
 phpBB.com.

PHPBB3-10254
---
 phpBB/styles/subsilver2/theme/stylesheet.css | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index e658994de4..444104ae3c 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -4,10 +4,6 @@
 	Based on style:		subSilver (the default phpBB 2.0.x style)
 	Original author:	Tom Beddard ( http://www.subblue.com/ )
 	Modified by:		phpBB Group ( http://www.phpbb.com/ )
-	
-	NOTE: This page was generated by phpBB, the free open-source bulletin board package.
-		  The phpBB Group is not responsible for the content of this page and forum.
-		  For more information about phpBB please visit http://www.phpbb.com/
     --------------------------------------------------------------
 */
 
-- 
cgit v1.2.1


From 983045348743d0205dd3a053df95e3ea993f9830 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 14 Nov 2011 18:41:19 +0100
Subject: [ticket/10452] Fix xHTML errors when print-viewing PMs

Also changed the layout of prosilvers PM print-view, so it looks like the post
print-view and not like the subsilver2 print-view.

PHPBB3-10452
---
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index 6753a5bc33..24194e4c26 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -61,7 +61,7 @@ hr.sep {
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
 <tr>
-	<td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</a></span></td>
+	<td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</span></td>
 </tr>
 <tr>
 	<td colspan="2"><br /></td>
-- 
cgit v1.2.1


From eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 12 Nov 2011 14:59:11 +0100
Subject: [ticket/8996] Also fix the BBCode bug in subsilver2 and acp

---
 phpBB/styles/subsilver2/template/editor.js | 96 +++++++++++++++---------------
 1 file changed, 49 insertions(+), 47 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 7cc5de9034..5aa486d320 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -6,8 +6,8 @@
 // Startup variables
 var imageTag = false;
 var theSelection = false;
-var bbcodeEnabled = true;
 
+var bbcodeEnabled = true;
 // Check for Browser & Platform for PC & IE specific bits
 // More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
 var clientPC = navigator.userAgent.toLowerCase(); // Get client info
@@ -15,7 +15,6 @@ var clientVer = parseInt(navigator.appVersion); // Get browser version
 
 var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
 var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
-
 var baseHeight;
 
 /**
@@ -29,8 +28,8 @@ function helpline(help)
 /**
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() 
+*/
+function initInsertions()
 {
 	var doc;
 
@@ -38,14 +37,15 @@ function initInsertions()
 	{
 		doc = document;
 	}
-	else 
+	else
 	{
 		doc = opener.document;
 	}
 
 	var textarea = doc.forms[form_name].elements[text_name];
+
 	if (is_ie && typeof(baseHeight) != 'number')
-	{	
+	{
 		textarea.focus();
 		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
 
@@ -60,12 +60,12 @@ function initInsertions()
 * bbstyle
 */
 function bbstyle(bbnumber)
-{	
+{
 	if (bbnumber != -1)
 	{
 		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	} 
-	else 
+	}
+	else
 	{
 		insert_text('[*]');
 		document.forms[form_name].elements[text_name].focus();
@@ -78,7 +78,7 @@ function bbstyle(bbnumber)
 function bbfontstyle(bbopen, bbclose)
 {
 	theSelection = false;
-		
+
 	var textarea = document.forms[form_name].elements[text_name];
 
 	textarea.focus();
@@ -86,14 +86,10 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection)
+		if (textarea.createTextRange && textarea.caretPos)
 		{
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
+			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
+			textarea.focus();
 			return;
 		}
 	}
@@ -104,7 +100,7 @@ function bbfontstyle(bbopen, bbclose)
 		theSelection = '';
 		return;
 	}
-	
+
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
 	var new_pos = caret_pos + bbopen.length;
@@ -118,12 +114,12 @@ function bbfontstyle(bbopen, bbclose)
 	{
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}	
+	}
 	// IE
 	else if (document.selection)
 	{
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
+		var range = textarea.createTextRange();
+		range.move("character", new_pos);
 		range.select();
 		storeCaret(textarea);
 	}
@@ -138,16 +134,16 @@ function bbfontstyle(bbopen, bbclose)
 function insert_text(text, spaces, popup)
 {
 	var textarea;
-	
-	if (!popup) 
+
+	if (!popup)
 	{
 		textarea = document.forms[form_name].elements[text_name];
-	} 
-	else 
+	}
+	else
 	{
 		textarea = opener.document.forms[form_name].elements[text_name];
 	}
-	if (spaces) 
+	if (spaces)
 	{
 		text = ' ' + text + ' ';
 	}
@@ -162,28 +158,26 @@ function insert_text(text, spaces, popup)
 		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
-	}	
-	
+	}
 	else if (textarea.createTextRange && textarea.caretPos)
 	{
-		if (baseHeight != textarea.caretPos.boundingHeight) 
+		if (baseHeight != textarea.caretPos.boundingHeight)
 		{
 			textarea.focus();
 			storeCaret(textarea);
-		}		
+		}
+
 		var caret_pos = textarea.caretPos;
 		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-		
 	}
 	else
 	{
 		textarea.value = textarea.value + text;
 	}
-	if (!popup) 
+	if (!popup)
 	{
 		textarea.focus();
-	} 	
-
+	}
 }
 
 /**
@@ -279,7 +273,6 @@ function addquote(post_id, username, l_wrote)
 	return;
 }
 
-
 function split_lines(text)
 {
 	var lines = text.split('\n');
@@ -298,7 +291,7 @@ function split_lines(text)
 			do
 			{
 				var splitAt = line.indexOf(' ', 80);
-				
+
 				if (splitAt == -1)
 				{
 					splitLines[j] = line;
@@ -316,7 +309,6 @@ function split_lines(text)
 	}
 	return splitLines;
 }
-
 /**
 * From http://www.massless.org/mozedit/
 */
@@ -327,7 +319,7 @@ function mozWrap(txtarea, open, close)
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2) 
+	if (selEnd == 1 || selEnd == 2)
 	{
 		selEnd = selLength;
 	}
@@ -351,7 +343,17 @@ function mozWrap(txtarea, open, close)
 */
 function storeCaret(textEl)
 {
-	if (textEl.createTextRange)
+	var keyCode = false;
+	if (is_ie)
+	{
+		keyCode = (event.keyCode) ? event.keyCode : event.charCode;
+	}
+
+	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
+	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
+	var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
+
+	if ((!is_ie || !is_control_key) && (textEl.createTextRange))
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -387,7 +389,7 @@ function colorPalette(dir, width, height)
 			{
 				document.writeln('<tr>');
 			}
-			
+
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -427,15 +429,15 @@ function caretPosition()
 function getCaretPosition(txtarea)
 {
 	var caretPos = new caretPosition();
-	
+
 	// simple Gecko/Opera way
-	if(txtarea.selectionStart || txtarea.selectionStart == 0)
+	if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
 	}
 	// dirty and slow IE way
-	else if(document.selection)
+	else if (document.selection)
 	{
 		// get current selection
 		var range = document.selection.createRange();
@@ -443,16 +445,16 @@ function getCaretPosition(txtarea)
 		// a new selection of the whole textarea
 		var range_all = document.body.createTextRange();
 		range_all.moveToElementText(txtarea);
-		
+
 		// calculate selection start point by moving beginning of range_all to beginning of range
 		var sel_start;
 		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{		
+		{
 			range_all.moveStart('character', 1);
 		}
-	
+
 		txtarea.sel_start = sel_start;
-	
+
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
 		caretPos.end = txtarea.sel_start;
-- 
cgit v1.2.1


From 06ae98b1e557661528f53be08244f6fa7338d9b6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 20 Nov 2011 21:41:24 +0100
Subject: [develop-olympus] Bumping version numbers to final for 3.0.10
 releases.

---
 phpBB/styles/subsilver2/imageset/imageset.cfg | 2 +-
 phpBB/styles/subsilver2/style.cfg             | 2 +-
 phpBB/styles/subsilver2/template/template.cfg | 2 +-
 phpBB/styles/subsilver2/theme/theme.cfg       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg
index d8cfabcb02..75a4aad038 100644
--- a/phpBB/styles/subsilver2/imageset/imageset.cfg
+++ b/phpBB/styles/subsilver2/imageset/imageset.cfg
@@ -19,7 +19,7 @@
 # General Information about this style
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.9
+version = 3.0.10
 
 # Images
 img_site_logo = site_logo.gif*94*170
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 0cdb7204bb..13e44435c6 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -19,4 +19,4 @@
 # General Information about this style
 name = subsilver2
 copyright = &copy; 2005 phpBB Group
-version = 3.0.9
+version = 3.0.10
diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg
index 92ccfef35a..4e5c36af99 100644
--- a/phpBB/styles/subsilver2/template/template.cfg
+++ b/phpBB/styles/subsilver2/template/template.cfg
@@ -19,5 +19,5 @@
 # General Information about this template
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.9
+version = 3.0.10
 
diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg
index 94e2f6d53d..d7837a3766 100644
--- a/phpBB/styles/subsilver2/theme/theme.cfg
+++ b/phpBB/styles/subsilver2/theme/theme.cfg
@@ -21,7 +21,7 @@
 # General Information about this theme
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.9
+version = 3.0.10
 
 # Some configuration options
 
-- 
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/subsilver2/template/ucp_register.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

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 730d2d5d19741508f243d61f47c28af2564be6b1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 15 Dec 2011 22:14:59 +0100
Subject: [ticket/8996] Revert initial fix to keep old behaviour on empty
 selection

Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp"

This reverts commit eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc.

PHPBB3-8996
---
 phpBB/styles/subsilver2/template/editor.js | 96 +++++++++++++++---------------
 1 file changed, 47 insertions(+), 49 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 5aa486d320..7cc5de9034 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -6,8 +6,8 @@
 // Startup variables
 var imageTag = false;
 var theSelection = false;
-
 var bbcodeEnabled = true;
+
 // Check for Browser & Platform for PC & IE specific bits
 // More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
 var clientPC = navigator.userAgent.toLowerCase(); // Get client info
@@ -15,6 +15,7 @@ var clientVer = parseInt(navigator.appVersion); // Get browser version
 
 var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
 var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
+
 var baseHeight;
 
 /**
@@ -28,8 +29,8 @@ function helpline(help)
 /**
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/
-function initInsertions()
+*/ 
+function initInsertions() 
 {
 	var doc;
 
@@ -37,15 +38,14 @@ function initInsertions()
 	{
 		doc = document;
 	}
-	else
+	else 
 	{
 		doc = opener.document;
 	}
 
 	var textarea = doc.forms[form_name].elements[text_name];
-
 	if (is_ie && typeof(baseHeight) != 'number')
-	{
+	{	
 		textarea.focus();
 		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
 
@@ -60,12 +60,12 @@ function initInsertions()
 * bbstyle
 */
 function bbstyle(bbnumber)
-{
+{	
 	if (bbnumber != -1)
 	{
 		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	}
-	else
+	} 
+	else 
 	{
 		insert_text('[*]');
 		document.forms[form_name].elements[text_name].focus();
@@ -78,7 +78,7 @@ function bbstyle(bbnumber)
 function bbfontstyle(bbopen, bbclose)
 {
 	theSelection = false;
-
+		
 	var textarea = document.forms[form_name].elements[text_name];
 
 	textarea.focus();
@@ -86,10 +86,14 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
-		if (textarea.createTextRange && textarea.caretPos)
+		theSelection = document.selection.createRange().text;
+
+		if (theSelection)
 		{
-			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
-			textarea.focus();
+			// Add tags around selection
+			document.selection.createRange().text = bbopen + theSelection + bbclose;
+			document.forms[form_name].elements[text_name].focus();
+			theSelection = '';
 			return;
 		}
 	}
@@ -100,7 +104,7 @@ function bbfontstyle(bbopen, bbclose)
 		theSelection = '';
 		return;
 	}
-
+	
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
 	var new_pos = caret_pos + bbopen.length;
@@ -114,12 +118,12 @@ function bbfontstyle(bbopen, bbclose)
 	{
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}
+	}	
 	// IE
 	else if (document.selection)
 	{
-		var range = textarea.createTextRange();
-		range.move("character", new_pos);
+		var range = textarea.createTextRange(); 
+		range.move("character", new_pos); 
 		range.select();
 		storeCaret(textarea);
 	}
@@ -134,16 +138,16 @@ function bbfontstyle(bbopen, bbclose)
 function insert_text(text, spaces, popup)
 {
 	var textarea;
-
-	if (!popup)
+	
+	if (!popup) 
 	{
 		textarea = document.forms[form_name].elements[text_name];
-	}
-	else
+	} 
+	else 
 	{
 		textarea = opener.document.forms[form_name].elements[text_name];
 	}
-	if (spaces)
+	if (spaces) 
 	{
 		text = ' ' + text + ' ';
 	}
@@ -158,26 +162,28 @@ function insert_text(text, spaces, popup)
 		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
-	}
+	}	
+	
 	else if (textarea.createTextRange && textarea.caretPos)
 	{
-		if (baseHeight != textarea.caretPos.boundingHeight)
+		if (baseHeight != textarea.caretPos.boundingHeight) 
 		{
 			textarea.focus();
 			storeCaret(textarea);
-		}
-
+		}		
 		var caret_pos = textarea.caretPos;
 		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
+		
 	}
 	else
 	{
 		textarea.value = textarea.value + text;
 	}
-	if (!popup)
+	if (!popup) 
 	{
 		textarea.focus();
-	}
+	} 	
+
 }
 
 /**
@@ -273,6 +279,7 @@ function addquote(post_id, username, l_wrote)
 	return;
 }
 
+
 function split_lines(text)
 {
 	var lines = text.split('\n');
@@ -291,7 +298,7 @@ function split_lines(text)
 			do
 			{
 				var splitAt = line.indexOf(' ', 80);
-
+				
 				if (splitAt == -1)
 				{
 					splitLines[j] = line;
@@ -309,6 +316,7 @@ function split_lines(text)
 	}
 	return splitLines;
 }
+
 /**
 * From http://www.massless.org/mozedit/
 */
@@ -319,7 +327,7 @@ function mozWrap(txtarea, open, close)
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2)
+	if (selEnd == 1 || selEnd == 2) 
 	{
 		selEnd = selLength;
 	}
@@ -343,17 +351,7 @@ function mozWrap(txtarea, open, close)
 */
 function storeCaret(textEl)
 {
-	var keyCode = false;
-	if (is_ie)
-	{
-		keyCode = (event.keyCode) ? event.keyCode : event.charCode;
-	}
-
-	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
-	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
-	var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
-
-	if ((!is_ie || !is_control_key) && (textEl.createTextRange))
+	if (textEl.createTextRange)
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -389,7 +387,7 @@ function colorPalette(dir, width, height)
 			{
 				document.writeln('<tr>');
 			}
-
+			
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -429,15 +427,15 @@ function caretPosition()
 function getCaretPosition(txtarea)
 {
 	var caretPos = new caretPosition();
-
+	
 	// simple Gecko/Opera way
-	if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
+	if(txtarea.selectionStart || txtarea.selectionStart == 0)
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
 	}
 	// dirty and slow IE way
-	else if (document.selection)
+	else if(document.selection)
 	{
 		// get current selection
 		var range = document.selection.createRange();
@@ -445,16 +443,16 @@ function getCaretPosition(txtarea)
 		// a new selection of the whole textarea
 		var range_all = document.body.createTextRange();
 		range_all.moveToElementText(txtarea);
-
+		
 		// calculate selection start point by moving beginning of range_all to beginning of range
 		var sel_start;
 		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{
+		{		
 			range_all.moveStart('character', 1);
 		}
-
+	
 		txtarea.sel_start = sel_start;
-
+	
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
 		caretPos.end = txtarea.sel_start;
-- 
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/subsilver2')

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 fa003bb5fd2fa87f5fec2b19d14fcd4a4eb9b052 Mon Sep 17 00:00:00 2001
From: Richard Foote <dicky@phpbb.com>
Date: Thu, 22 Dec 2011 00:45:16 -0500
Subject: [ticket/10542] Remove class="postlink" in subsilver2 faq_body.html

class="postlink" is not defined in stylesheet.css so remove it from
styles/subsilver2/template/faq_body.html

PHPBB3-10542
---
 phpBB/styles/subsilver2/template/faq_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/faq_body.html b/phpBB/styles/subsilver2/template/faq_body.html
index bbd9b82b19..6a4df3659c 100644
--- a/phpBB/styles/subsilver2/template/faq_body.html
+++ b/phpBB/styles/subsilver2/template/faq_body.html
@@ -13,7 +13,7 @@
 		<!-- BEGIN faq_block -->
 			<span class="gen"><b>{faq_block.BLOCK_TITLE}</b></span><br />
 			<!-- BEGIN faq_row -->
-				<span class="gen"><a class="postlink" href="#f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}">{faq_block.faq_row.FAQ_QUESTION}</a></span><br />
+				<span class="gen"><a href="#f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}">{faq_block.faq_row.FAQ_QUESTION}</a></span><br />
 			<!-- END faq_row -->
 			<br />
 		<!-- END faq_block -->
-- 
cgit v1.2.1


From 656a8ece6f2d52d35dfecb4a27c3709379583f48 Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sat, 31 Dec 2011 13:32:52 +0000
Subject: [ticket/9916] Updating header license and removing Version $Id$

PHPBB3-9916
---
 phpBB/styles/subsilver2/style.cfg             | 2 +-
 phpBB/styles/subsilver2/template/template.cfg | 2 +-
 phpBB/styles/subsilver2/theme/theme.cfg       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index fc76c884e0..0804a27082 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -3,7 +3,7 @@
 #
 # @package phpBB3
 # @copyright (c) 2005 phpBB Group
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License
+# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 #
 #
 # At the left is the name, please do not change this
diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg
index 29361a59ff..82d3d2681b 100644
--- a/phpBB/styles/subsilver2/template/template.cfg
+++ b/phpBB/styles/subsilver2/template/template.cfg
@@ -3,7 +3,7 @@
 #
 # @package phpBB3
 # @copyright (c) 2005 phpBB Group
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License
+# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 #
 #
 # At the left is the name, please do not change this
diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg
index c560dabae2..16d66c844a 100644
--- a/phpBB/styles/subsilver2/theme/theme.cfg
+++ b/phpBB/styles/subsilver2/theme/theme.cfg
@@ -3,7 +3,7 @@
 #
 # @package phpBB3
 # @copyright (c) 2005 phpBB Group
-# @license http://opensource.org/licenses/gpl-license.php GNU Public License
+# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 #
 #
 # At the left is the name, please do not change this
-- 
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/subsilver2/theme/stylesheet.css | 38 ++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'phpBB/styles/subsilver2')

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 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/subsilver2')

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/subsilver2/template/template.cfg | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/styles/subsilver2')

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 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/subsilver2/template/mcp_front.html | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'phpBB/styles/subsilver2')

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 cd5c01ac2da2ec316e997e8850e1b2d326191e56 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Feb 2012 11:10:10 +0100
Subject: [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to
 the subject

I also added tabindex 1 to the buttons for adding the recipients.
Also note, that duplicated tabindex are fine:
http://www.w3.org/TR/html4/interact/forms.html#adef-tabindex

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

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/ucp_header.html b/phpBB/styles/subsilver2/template/ucp_header.html
index ea64dcb299..1566a15929 100644
--- a/phpBB/styles/subsilver2/template/ucp_header.html
+++ b/phpBB/styles/subsilver2/template/ucp_header.html
@@ -26,7 +26,7 @@
 			<td class="row1"><b class="genmed">{L_USERNAMES}:</b></td>
 		</tr>
 		<tr>
-			<td class="row2"><textarea name="username_list" rows="5" cols="22"></textarea><br />
+			<td class="row2"><textarea name="username_list" rows="5" cols="22" tabindex="1"></textarea><br />
 				[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]
 			</td>
 		</tr>
@@ -41,7 +41,7 @@
 	<!-- ENDIF -->
 	<!-- IF S_ALLOW_MASS_PM -->
 		<tr>
-			<td class="row1"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<input class="post" type="submit" name="add_bcc" value="{L_ADD_BCC}" />&nbsp;</div><div style="float: {S_CONTENT_FLOW_END};">&nbsp;<input class="post" type="submit" name="add_to" value="{L_ADD_TO}" />&nbsp;</div></td>
+			<td class="row1"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<input class="post" type="submit" name="add_bcc" value="{L_ADD_BCC}" tabindex="1" />&nbsp;</div><div style="float: {S_CONTENT_FLOW_END};">&nbsp;<input class="post" type="submit" name="add_to" value="{L_ADD_TO}" tabindex="1" />&nbsp;</div></td>
 		</tr>
 	<!-- ENDIF -->
 	</table>
-- 
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/subsilver2')

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 8e1e48a7b69b78e10297869e3aaf224e5c12e493 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 23 Feb 2012 10:55:57 +0100
Subject: [ticket/8636] Add resync option to topic_view moderation page

PHPBB3-8636
---
 phpBB/styles/subsilver2/template/mcp_topic.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html
index 13865d26ee..f9f9382ff2 100644
--- a/phpBB/styles/subsilver2/template/mcp_topic.html
+++ b/phpBB/styles/subsilver2/template/mcp_topic.html
@@ -135,6 +135,7 @@
 		<!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF -->
 		<!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF ACTION eq 'merge' --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF -->
 		<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF ACTION eq 'split' --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF -->
+		<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
 	</select>&nbsp;<input class="btnmain" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}" /></td>
 </tr>
 </table>
-- 
cgit v1.2.1


From 17dc8c6c5c0e651a305961fae579c59d09abf88d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 27 Feb 2012 17:16:42 +0100
Subject: [ticket/9089] Add tabindex to pm/topic/post icon-options aswell

PHPBB3-9089
---
 phpBB/styles/subsilver2/template/posting_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index fec6d7ff6c..dbdf6b230c 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -127,7 +127,7 @@
 		<td class="row2">
 			<table width="100%" cellspacing="0" cellpadding="0" border="0">
 			<tr>
-				<td><input type="radio" class="radio" name="icon" value="0"{S_NO_ICON_CHECKED} /><span class="genmed"><!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></span> <!-- BEGIN topic_icon --><span style="white-space: nowrap;"><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /></span> <!-- END topic_icon --></td>
+				<td><input type="radio" class="radio" name="icon" value="0"{S_NO_ICON_CHECKED} tabindex="1" /><span class="genmed"><!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></span> <!-- BEGIN topic_icon --><span style="white-space: nowrap;"><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /></span> <!-- END topic_icon --></td>
 			</tr>
 			</table>
 		</td>
-- 
cgit v1.2.1


From c5de658c7f15a6ab0028353684323c3ef21521c9 Mon Sep 17 00:00:00 2001
From: callumacrae <callum@lynxphp.com>
Date: Fri, 2 Dec 2011 17:26:39 +0000
Subject: [ticket/10510] Moved quick-mod tools markup to template.

PHPBB3-10510
---
 .../styles/subsilver2/template/viewtopic_body.html | 24 +++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index b8387482bf..f9526b9b28 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -347,7 +347,29 @@
 
 <table width="100%" cellspacing="1">
 <tr>
-	<td width="40%" valign="top" nowrap="nowrap" align="{S_CONTENT_FLOW_BEGIN}"><!-- IF S_TOPIC_MOD --><form method="post" action="{S_MOD_ACTION}"><span class="gensmall">{L_QUICK_MOD}:</span> {S_TOPIC_MOD} <input class="btnlite" type="submit" value="{L_GO}" /></form><!-- ENDIF --></td>
+	<td width="40%" valign="top" nowrap="nowrap" align="{S_CONTENT_FLOW_BEGIN}">
+	<!-- IF S_TOPIC_MOD -->
+		<form method="post" action="{S_MOD_ACTION}">
+			<span class="gensmall">{L_QUICK_MOD}:</span>
+			<select name="action" id="quick-mod-select">
+				<!-- IF S_TOPIC_MOD_LOCK eq 'lock' --><option value="lock">{L_LOCK_TOPIC}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_LOCK eq 'unlock' --><option value="unlock">{L_UNLOCK_TOPIC}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_DELETE --><option value="delete_topic">{L_DELETE_TOPIC}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_MOVE --><option value="move">{L_MOVE_TOPIC}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_SPLIT--><option value="split">{L_SPLIT_TOPIC}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_MERGE --><option value="merge">{L_MERGE_POSTS}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_MERGE_TOPIC --><option value="merge_topic">{L_MERGE_TOPIC}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_FORK --><option value="fork">{L_FORK_TOPIC}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_MAKE_NORMAL --><option value="make_normal">{L_MAKE_NORMAL}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_MAKE_STICKY --><option value="make_sticky">{L_MAKE_STICKY}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_MAKE_ANNOUNCE --><option value="make_announce">{L_MAKE_ANNOUNCE}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_MAKE_GLOBAL --><option value="make_global">{L_MAKE_GLOBAL}</option><!-- ENDIF -->
+				<!-- IF S_TOPIC_MOD_TOPIC_LOGS --><option value="topic_logs">{L_VIEW_TOPIC_LOGS}</option><!-- ENDIF -->
+			</select>
+			<input class="btnlite" type="submit" value="{L_GO}" />
+		</form>
+	<!-- ENDIF -->
+	</td>
 	<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><span class="gensmall"><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></span></td>
 </tr>
 </table>
-- 
cgit v1.2.1


From 2b0282cba73c8649b1649444a23c3913cc652de2 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Tue, 20 Dec 2011 09:27:56 +0000
Subject: [ticket/10510] Updated quick-mod conditional in subsilver2.

It was still trying to use the old conditional, which was referring to a
variable which had been removed.

PHPBB3-10510
---
 phpBB/styles/subsilver2/template/viewtopic_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index f9526b9b28..a431d51c79 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -348,7 +348,7 @@
 <table width="100%" cellspacing="1">
 <tr>
 	<td width="40%" valign="top" nowrap="nowrap" align="{S_CONTENT_FLOW_BEGIN}">
-	<!-- IF S_TOPIC_MOD -->
+	<!-- IF S_TOPIC_MOD_LOCK or S_TOPIC_MOD_DELETE or S_TOPIC_MOD_MOVE or S_TOPIC_MOD_SPLIT or S_TOPIC_MOD_MERGE or S_TOPIC_MOD_MERGE_TOPIC or S_TOPIC_MOD_FORK or S_TOPIC_MOD_MAKE_NORMAL or S_TOPIC_MOD_MAKE_STICKY or S_TOPIC_MOD_MAKE_ANNOUNCE or S_TOPIC_MOD_MAKE_GLOBAL or S_TOPIC_MOD_TOPIC_LOGS -->
 		<form method="post" action="{S_MOD_ACTION}">
 			<span class="gensmall">{L_QUICK_MOD}:</span>
 			<select name="action" id="quick-mod-select">
-- 
cgit v1.2.1


From 33dce916e2ed58f1823f3b3fc1b2d72ae3c6686a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Mar 2012 22:22:22 +0100
Subject: [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue

PHPBB3-10690
---
 phpBB/styles/subsilver2/template/mcp_queue.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/mcp_queue.html b/phpBB/styles/subsilver2/template/mcp_queue.html
index 6e39ccd272..d13af91888 100644
--- a/phpBB/styles/subsilver2/template/mcp_queue.html
+++ b/phpBB/styles/subsilver2/template/mcp_queue.html
@@ -27,7 +27,7 @@
 	</tr>
 <!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="4" height="30" align="center" valign="middle"><span class="gen"><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_UNAPPROVED_POSTS_ZERO_TOTAL}<!-- ENDIF --></span></td>
+		<td class="row1" colspan="4" height="30" align="center" valign="middle"><span class="gen"><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_NO_POSTS_QUEUE}<!-- ENDIF --></span></td>
 	</tr>
 <!-- END postrow -->
 <tr>
-- 
cgit v1.2.1


From 1cc9f60f959730c8432a8489527ce9e1606a7ebd Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Wed, 14 Mar 2012 23:26:01 +0200
Subject: [feature/merging-style-components] Removing theme.cfg and
 template.cfg

Removing theme.cfg and template.cfg

PHPBB3-10632
---
 phpBB/styles/subsilver2/template/template.cfg | 27 ---------------------------
 phpBB/styles/subsilver2/theme/theme.cfg       | 21 ---------------------
 2 files changed, 48 deletions(-)
 delete mode 100644 phpBB/styles/subsilver2/template/template.cfg
 delete mode 100644 phpBB/styles/subsilver2/theme/theme.cfg

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg
deleted file mode 100644
index cf5562a8a4..0000000000
--- a/phpBB/styles/subsilver2/template/template.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# phpBB Template Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2005 phpBB Group
-# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes.
-# Single and double quotes do not need to be escaped.
-#
-#
-
-# General Information about this template
-name = subsilver2
-copyright = &copy; phpBB Group, 2003
-version = 3.1.0-dev
-
-# 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
diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg
deleted file mode 100644
index 16d66c844a..0000000000
--- a/phpBB/styles/subsilver2/theme/theme.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# phpBB Theme Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2005 phpBB Group
-# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes.
-# Single and double quotes do not need to be escaped.
-#
-
-# General Information about this theme
-name = subsilver2
-copyright = &copy; phpBB Group, 2003
-version = 3.1.0-dev
-- 
cgit v1.2.1


From 95a69639fdc8491e47386dcc7e95e715fe769aed Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Wed, 14 Mar 2012 23:26:23 +0200
Subject: [feature/merging-style-components] Adding template information to
 style.cfg

Adding template data to style.cfg and removing obsolete comments

PHPBB3-10632
---
 phpBB/styles/subsilver2/style.cfg | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 0804a27082..1a71e7254d 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -8,7 +8,6 @@
 #
 # At the left is the name, please do not change this
 # At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
 #
 # Values get trimmed, if you want to add a space in front or at the end of
 # the value, then enclose the value with single or double quotes.
@@ -20,3 +19,10 @@
 name = subsilver2
 copyright = &copy; 2005 phpBB Group
 version = 3.1.0-dev
+
+# Defining a different template bitfield
+# template_bitfield = lNg=
+
+# Parent style
+# Set value to empty or to this style's name if this style does not have a parent style
+parent = subsilver2
-- 
cgit v1.2.1


From 56a7038aa57a1ec473196e01f68b7c8a1d0a89b6 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 15 Mar 2011 07:56:21 -0400
Subject: [feature/new-tz-handling] Removed DST options from templates.

PHPBB3-9558
---
 phpBB/styles/subsilver2/template/ucp_prefs_personal.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
index 8e4b04fc10..357e1fe100 100644
--- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
@@ -77,10 +77,6 @@
 		<select id="tz" name="tz">{S_TZ_OPTIONS}</select>
 	</td>
 </tr>
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_BOARD_DST}:</b></td>
-	<td class="row2"><input type="radio" class="radio" name="dst" value="1"<!-- IF S_DST --> checked="checked"<!-- ENDIF --> /> <span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="dst" value="0"<!-- IF not S_DST --> checked="checked"<!-- ENDIF --> /> <span class="genmed">{L_NO}</span></td>
-</tr>
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}:</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td>
 	<td class="row2">
-- 
cgit v1.2.1


From 9a07f5287c91549dc989615f0cf6dc1fd8f82e5f Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sun, 4 Mar 2012 10:32:06 +0000
Subject: [ticket/10510] Moved quick-mod tools into a loop.

PHPBB3-10510
---
 phpBB/styles/subsilver2/template/viewtopic_body.html | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index a431d51c79..f696254249 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -352,19 +352,9 @@
 		<form method="post" action="{S_MOD_ACTION}">
 			<span class="gensmall">{L_QUICK_MOD}:</span>
 			<select name="action" id="quick-mod-select">
-				<!-- IF S_TOPIC_MOD_LOCK eq 'lock' --><option value="lock">{L_LOCK_TOPIC}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_LOCK eq 'unlock' --><option value="unlock">{L_UNLOCK_TOPIC}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_DELETE --><option value="delete_topic">{L_DELETE_TOPIC}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_MOVE --><option value="move">{L_MOVE_TOPIC}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_SPLIT--><option value="split">{L_SPLIT_TOPIC}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_MERGE --><option value="merge">{L_MERGE_POSTS}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_MERGE_TOPIC --><option value="merge_topic">{L_MERGE_TOPIC}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_FORK --><option value="fork">{L_FORK_TOPIC}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_MAKE_NORMAL --><option value="make_normal">{L_MAKE_NORMAL}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_MAKE_STICKY --><option value="make_sticky">{L_MAKE_STICKY}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_MAKE_ANNOUNCE --><option value="make_announce">{L_MAKE_ANNOUNCE}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_MAKE_GLOBAL --><option value="make_global">{L_MAKE_GLOBAL}</option><!-- ENDIF -->
-				<!-- IF S_TOPIC_MOD_TOPIC_LOGS --><option value="topic_logs">{L_VIEW_TOPIC_LOGS}</option><!-- ENDIF -->
+				<!-- BEGIN quickmod -->
+				<option value="{quickmod.VALUE}">{quickmod.TITLE}</option>
+				<!-- END quickmod -->
 			</select>
 			<input class="btnlite" type="submit" value="{L_GO}" />
 		</form>
-- 
cgit v1.2.1


From c52e99fdbb4854f57ab8e4c6ad1fe06c4944a492 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Thu, 8 Mar 2012 18:41:22 +0000
Subject: [ticket/10510] Fixed a bug where quickmod tools weren't being
 displayed.

It was referring to some template variables that were removed in a
previous commit. Changed!

PHPBB3-10510
---
 phpBB/styles/subsilver2/template/viewtopic_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index f696254249..2c5351b926 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -348,7 +348,7 @@
 <table width="100%" cellspacing="1">
 <tr>
 	<td width="40%" valign="top" nowrap="nowrap" align="{S_CONTENT_FLOW_BEGIN}">
-	<!-- IF S_TOPIC_MOD_LOCK or S_TOPIC_MOD_DELETE or S_TOPIC_MOD_MOVE or S_TOPIC_MOD_SPLIT or S_TOPIC_MOD_MERGE or S_TOPIC_MOD_MERGE_TOPIC or S_TOPIC_MOD_FORK or S_TOPIC_MOD_MAKE_NORMAL or S_TOPIC_MOD_MAKE_STICKY or S_TOPIC_MOD_MAKE_ANNOUNCE or S_TOPIC_MOD_MAKE_GLOBAL or S_TOPIC_MOD_TOPIC_LOGS -->
+	<!-- IF .quickmod -->
 		<form method="post" action="{S_MOD_ACTION}">
 			<span class="gensmall">{L_QUICK_MOD}:</span>
 			<select name="action" id="quick-mod-select">
-- 
cgit v1.2.1


From c241a4a2b484b561b5515c6f8211a21d39fd8d78 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Fri, 3 Feb 2012 20:54:24 +0000
Subject: [feature/save-post-on-report] Saves the post reported when a report
 is creat

A problem when creating a report is that the report may be made and then
the post changed. After the changes, if the report is seen the message
it shows may not be correct to be reported. With these changes, when
a report is created the system copies the post that was reported and
shows it in the report details in the MCP

PHPBB3-10600
---
 phpBB/styles/subsilver2/template/posting_topic_review.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/posting_topic_review.html b/phpBB/styles/subsilver2/template/posting_topic_review.html
index 2bfa95f3d4..92f71c2307 100644
--- a/phpBB/styles/subsilver2/template/posting_topic_review.html
+++ b/phpBB/styles/subsilver2/template/posting_topic_review.html
@@ -51,6 +51,7 @@
 							<table width="100%" cellspacing="0" cellpadding="2">
 							<tr>
 								<td>
+									<!-- IF topic_review_row.POST_ID == REPORTED_POST_ID --><span class="postreported">{REPORTED_IMG}</span><!-- ENDIF -->
 									<div class="postbody">{topic_review_row.MESSAGE}</div>
 
 									<!-- IF topic_review_row.S_HAS_ATTACHMENTS -->
-- 
cgit v1.2.1


From 3a044b4b3ef6b5a7c27ea357bc3b7d7dd101a262 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Fri, 9 Mar 2012 15:56:43 +0000
Subject: [feature/save-post-on-report] Changed mark in subsilver2 to look like
 viewtopic

As cyberalien requested. This was changed to match better the idea behind
what was made in prosilver to subsilver2.

PHPBB3-10600
---
 phpBB/styles/subsilver2/template/posting_topic_review.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/posting_topic_review.html b/phpBB/styles/subsilver2/template/posting_topic_review.html
index 92f71c2307..cbd6746a8a 100644
--- a/phpBB/styles/subsilver2/template/posting_topic_review.html
+++ b/phpBB/styles/subsilver2/template/posting_topic_review.html
@@ -51,7 +51,13 @@
 							<table width="100%" cellspacing="0" cellpadding="2">
 							<tr>
 								<td>
-									<!-- IF topic_review_row.POST_ID == REPORTED_POST_ID --><span class="postreported">{REPORTED_IMG}</span><!-- ENDIF -->
+									<!-- IF topic_review_row.POST_ID == REPORTED_POST_ID -->
+									<table width="100%" cellspacing="0">
+										<tr>
+											<span class="postreported">{REPORTED_IMG}</span>
+										</tr>
+									</table>
+									<!-- ENDIF -->
 									<div class="postbody">{topic_review_row.MESSAGE}</div>
 
 									<!-- IF topic_review_row.S_HAS_ATTACHMENTS -->
-- 
cgit v1.2.1


From 56629d8e3c80cd490b8ec39d4fa102d0303f9a4b Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 29 Mar 2012 15:52:28 +0100
Subject: [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2

Located the L_WARNINGS_ZERO_TOTAL in subsilver2 and replaced it with
L_NO_WARNINGS

PHPBB3-10705
---
 phpBB/styles/subsilver2/template/mcp_warn_front.html | 4 ++--
 phpBB/styles/subsilver2/template/mcp_warn_list.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/mcp_warn_front.html b/phpBB/styles/subsilver2/template/mcp_warn_front.html
index 417355d537..020a79f419 100644
--- a/phpBB/styles/subsilver2/template/mcp_warn_front.html
+++ b/phpBB/styles/subsilver2/template/mcp_warn_front.html
@@ -38,7 +38,7 @@
 	</tr>
 <!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td>
+		<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
 	</tr>
 <!-- END highest -->
 </table>
@@ -64,7 +64,7 @@
 	</tr>
 <!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td>
+		<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
 	</tr>
 <!-- END latest -->
 </table>
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_list.html b/phpBB/styles/subsilver2/template/mcp_warn_list.html
index 6ed0b68bd5..0b0cfa8a45 100644
--- a/phpBB/styles/subsilver2/template/mcp_warn_list.html
+++ b/phpBB/styles/subsilver2/template/mcp_warn_list.html
@@ -21,7 +21,7 @@
 	</tr>
 <!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td>
+		<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
 	</tr>
 <!-- END user -->
 <tr align="center">
-- 
cgit v1.2.1


From a7045e65724481002e232a7d143b7cc2ed6acb3a Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 30 Mar 2012 21:43:00 -0400
Subject: [feature/qrpreview] Preview from Quick Reply

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

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/quickreply_editor.html b/phpBB/styles/subsilver2/template/quickreply_editor.html
index de5017280c..4c3f7a3d0b 100644
--- a/phpBB/styles/subsilver2/template/quickreply_editor.html
+++ b/phpBB/styles/subsilver2/template/quickreply_editor.html
@@ -14,8 +14,8 @@
 		</tr>
 		<tr>
 			<td class="cat" colspan="2" align="center">
-				<input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />&nbsp;
-				<input class="btnlite" type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" />
+				<input class="btnlite" type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" />&nbsp;
+				<input class="btnmain" type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" />
 
 				{S_FORM_TOKEN}
 				{QR_HIDDEN_FIELDS}
-- 
cgit v1.2.1


From 2225efc5609add8baf0dc0e7867d9f9f0fae4245 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 10:58:59 +0300
Subject: [ticket/10665] INCLUDEJS template changes

Implementing INLCUDEJS template tag in styles

PHPBB3-10665
---
 phpBB/styles/subsilver2/template/overall_footer.html | 1 +
 phpBB/styles/subsilver2/template/simple_footer.html  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 9b0b95372e..77b11034b9 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -10,6 +10,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+{SCRIPTS}
 
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index b51be3ac4c..4a65bafd1c 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -7,6 +7,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+{SCRIPTS}
 
 </body>
 </html>
-- 
cgit v1.2.1


From e7cf4bfb2ed2b549e567c7237df799b6af0977ae Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Sun, 1 Apr 2012 18:25:50 +0530
Subject: [ticket/10731] Fixed addquote() to work on opera browser.

In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.

PHPBB3-10731
---
 phpBB/styles/subsilver2/template/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index b47583ec75..151cf53ff1 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -221,7 +221,7 @@ function addquote(post_id, username, l_wrote)
 
 	// Get text selection - not only the post content :(
 	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
-	if (window.getSelection && !is_ie)
+	if (window.getSelection && !is_ie && !window.opera)
 	{
 		theSelection = window.getSelection().toString();
 	}
-- 
cgit v1.2.1


From b1b530f92cca7eb115e096ea8901133d421771d2 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Sun, 1 Apr 2012 18:25:50 +0530
Subject: [ticket/10731] Fixed addquote() to work on opera browser.

In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.

PHPBB3-10731
---
 phpBB/styles/subsilver2/template/editor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 7cc5de9034..151cf53ff1 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -221,7 +221,7 @@ function addquote(post_id, username, l_wrote)
 
 	// Get text selection - not only the post content :(
 	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
-	if (window.getSelection && !is_ie)
+	if (window.getSelection && !is_ie && !window.opera)
 	{
 		theSelection = window.getSelection().toString();
 	}
@@ -459,4 +459,4 @@ function getCaretPosition(txtarea)
 	}
 
 	return caretPos;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1


From 0ceb77fb995e7433242a87c1fe0c22840a2b23e1 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Tue, 3 Apr 2012 19:29:34 +0800
Subject: [ticket/10607] Added 'Powered by' translation string.

Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
---
 phpBB/styles/subsilver2/template/overall_footer.html | 2 +-
 phpBB/styles/subsilver2/template/simple_footer.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 5d6b63986f..6cd7a215b0 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -3,7 +3,7 @@
 
 <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/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+	<span class="copyright">{CREDIT_LINE}
 	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
 </div>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index 043be16cdb..db95c7952a 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -2,7 +2,7 @@
 </div>
 
 <div id="wrapfooter">
-	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group</span>
+	<span class="copyright">{CREDIT_LINE}
 </div>
 
 </body>
-- 
cgit v1.2.1


From e769e0f723224b24cd9363530eb101be4818dc21 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Wed, 4 Apr 2012 13:07:24 +0300
Subject: [ticket/10762] Changing version format in style.cfg

Splitting version into style_version and phpbb_version in style.cfg

PHPBB3-10762
---
 phpBB/styles/subsilver2/style.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 1a71e7254d..ca81337d17 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -18,7 +18,8 @@
 # General Information about this style
 name = subsilver2
 copyright = &copy; 2005 phpBB Group
-version = 3.1.0-dev
+style_version = 3.1.0-dev
+phpbb_version = 3.1.0-dev
 
 # Defining a different template bitfield
 # template_bitfield = lNg=
-- 
cgit v1.2.1


From 4771af08339d456174cbe3ebb1563e0f756733dd Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 11 Apr 2012 14:33:09 +0100
Subject: [ticket/10783] Added assets_version to subsilver2.

PHPBB3-10783
---
 phpBB/styles/subsilver2/template/overall_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 4f686cf5e4..24c6f8105c 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -9,7 +9,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
 </body>
-- 
cgit v1.2.1


From 6ad58c7e046c9f257ad5441b7a583cddb213ad3f Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 11 Apr 2012 14:37:15 +0100
Subject: [ticket/10783] Added assets_version to ACP and simple_*.html.

PHPBB3-10783
---
 phpBB/styles/subsilver2/template/simple_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index 771765ee12..6082b71891 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -6,7 +6,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
 </body>
-- 
cgit v1.2.1


From 8d45901657801dcbf33ac2936559dbfe2ac373d8 Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Fri, 27 Apr 2012 22:19:41 +0200
Subject: [ticket/10849] Added missing helptext for listitem

Added the missing helptext for list item in subsilver2.

PHPBB3-10849
---
 phpBB/styles/subsilver2/template/posting_buttons.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index a9105b5eec..cfe69dee56 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -16,6 +16,7 @@
 			q: '{LA_BBCODE_Q_HELP}',
 			c: '{LA_BBCODE_C_HELP}',
 			l: '{LA_BBCODE_L_HELP}',
+			e: '{LA_BBCODE_LISTITEM_HELP}',
 			o: '{LA_BBCODE_O_HELP}',
 			p: '{LA_BBCODE_P_HELP}',
 			w: '{LA_BBCODE_W_HELP}',
-- 
cgit v1.2.1


From 2dd71f65204c8e484c81147e4966e33fcb7d1f42 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Tue, 1 May 2012 09:52:48 +0200
Subject: [ticket/10835] fixing misleading message in UCP

PHPBB3-10835
---
 phpBB/styles/subsilver2/template/ucp_profile_reg_details.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
index 78fb5a9628..09f60ad5a7 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
@@ -42,7 +42,7 @@
 	<th colspan="2">{L_CONFIRM_CHANGES}</th>
 </tr>
 <tr>
-	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall">{L_CURRENT_PASSWORD_EXPLAIN}</span></td>
+	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall"><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></td>
 	<td class="row2"><input type="password" class="post" name="cur_password" size="30" maxlength="255" value="{CUR_PASSWORD}" /></td>
 </tr>
 <tr>
-- 
cgit v1.2.1


From fc3a19567f1852389dfa78472cca4b1d01387bfa Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 16 May 2012 13:44:40 +0200
Subject: [ticket/10811] Make it easier for MODs/Extensions to define the
 alt-text

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

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index 2c5351b926..a4e2dd886a 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -52,8 +52,8 @@
 			<tr>
 				<td class="nav" nowrap="nowrap">&nbsp;
 				<!-- IF not S_IS_BOT -->
-					<!-- IF U_WATCH_TOPIC --><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC or U_BOOKMARK_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
-					<!-- IF U_BOOKMARK_TOPIC --><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
+					<!-- IF U_WATCH_TOPIC --><a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}">{S_WATCH_TOPIC_TITLE}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC or U_BOOKMARK_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
+					<!-- IF U_BOOKMARK_TOPIC --><a href="{U_BOOKMARK_TOPIC}" title="{S_BOOKMARK_TOPIC}">{S_BOOKMARK_TOPIC}</a><!-- IF U_PRINT_TOPIC or U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
 					<!-- IF U_PRINT_TOPIC --><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}">{L_PRINT_TOPIC}</a><!-- IF U_EMAIL_TOPIC or U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
 					<!-- IF U_EMAIL_TOPIC --><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a><!-- IF U_BUMP_TOPIC --> | <!-- ENDIF --><!-- ENDIF -->
 					<!-- IF U_BUMP_TOPIC --><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a><!-- ENDIF -->
-- 
cgit v1.2.1


From ca0d5ebf7a289e7ba759023e6322820450e79ec7 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 13 Apr 2012 21:38:22 +0530
Subject: [feature/delete-auto-logins] template added for subsilver2

PHPBB3-9647
---
 .../template/ucp_profile_autologin_keys.html       | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
new file mode 100644
index 0000000000..cb6aac7674
--- /dev/null
+++ b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
@@ -0,0 +1,51 @@
+<!-- INCLUDE ucp_header.html -->
+
+<table class="tablebg" width="100%" cellspacing="1">
+<tr>
+	<th colspan="4" valign="middle">{L_TITLE}</th>
+</tr>
+<!-- IF .errors -->
+	<tr>
+		<td class="row3" colspan="2" align="center"><span class="gensmall error">
+			<!-- BEGIN errors -->
+				{errors} <br />
+			<!-- END errors -->
+		</td>
+	</tr>
+<!-- ENDIF -->
+<!-- IF .sessions -->
+	<tr>
+		<td colspan="4" class="row1">{L_PROFILE_AUTOLOGIN_KEYS}</td>
+	</tr>
+	<tr>
+		<th>Mark</th>
+		<th>Key</th>
+		<th>IP</th>
+		<th>Login-Time</th>
+	</tr>
+	<!-- BEGIN sessions -->
+		<!-- IF sessions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td class="genmed" style="text-align: center"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}"/></td>
+			<td class="genmed"><label for="{sessions.KEY}">{sessions.KEY}</label></td>
+			<td class="genmed" style="text-align: center">{sessions.IP}</td>
+			<td class="genmed" style="text-align: center">{sessions.LOGIN_TIME}</td>
+		</tr>
+	<!-- END sessions -->
+<!-- ELSE -->
+	<tr>
+		<td colspan="4" class="row1">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td>
+	</tr>
+<!-- ENDIF -->
+
+<!-- IF .sessions -->
+	<tr>
+		<td class="cat" colspan="4" align="center">
+			{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+			<input type="submit" name="submit" value="{L_DELETE}" class="button1" />
+			{S_FORM_TOKEN}
+		</td>
+	</tr>
+<!-- ENDIF -->
+</table>
+
+<!-- INCLUDE ucp_footer.html -->
-- 
cgit v1.2.1


From 9db1ed6e804e1ebf536b81d1d68daf44d558c2e1 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sat, 21 Apr 2012 13:28:01 +0530
Subject: [feature/delete-auto-logins] fix language keys and styling

introduction of language variables instead of hardcoded language.

PHPBB3-9647
---
 phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
index cb6aac7674..365b6f4a52 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
@@ -18,10 +18,10 @@
 		<td colspan="4" class="row1">{L_PROFILE_AUTOLOGIN_KEYS}</td>
 	</tr>
 	<tr>
-		<th>Mark</th>
-		<th>Key</th>
-		<th>IP</th>
-		<th>Login-Time</th>
+		<th>{L_MARK}</th>
+		<th>{L_LOGIN_KEY}</th>
+		<th>{L_IP}</th>
+		<th>{L_LOGIN_TIME}</th>
 	</tr>
 	<!-- BEGIN sessions -->
 		<!-- IF sessions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-- 
cgit v1.2.1


From d612a7e647b276c33c320d75108405847df7ac1d Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sat, 21 Apr 2012 16:21:37 +0530
Subject: [feature/delete-auto-logins] improves styling

PHPBB3-9647
---
 .../template/ucp_profile_autologin_keys.html       | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
index 365b6f4a52..2d3b9f98f8 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
@@ -13,29 +13,28 @@
 		</td>
 	</tr>
 <!-- ENDIF -->
-<!-- IF .sessions -->
-	<tr>
-		<td colspan="4" class="row1">{L_PROFILE_AUTOLOGIN_KEYS}</td>
-	</tr>
-	<tr>
-		<th>{L_MARK}</th>
-		<th>{L_LOGIN_KEY}</th>
-		<th>{L_IP}</th>
-		<th>{L_LOGIN_TIME}</th>
+
+<tr>
+	<td colspan="4" class="row1">{L_PROFILE_AUTOLOGIN_KEYS}</td>
+</tr>
+<tr>
+	<th>{L_MARK}</th>
+	<th>{L_LOGIN_KEY}</th>
+	<th>{L_IP}</th>
+	<th>{L_LOGIN_TIME}</th>
+</tr>
+<!-- BEGIN sessions -->
+	<!-- IF sessions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td class="genmed" style="text-align: center"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}"/></td>
+		<td class="genmed"><label for="{sessions.KEY}">{sessions.KEY}</label></td>
+		<td class="genmed" style="text-align: center">{sessions.IP}</td>
+		<td class="genmed" style="text-align: center">{sessions.LOGIN_TIME}</td>
 	</tr>
-	<!-- BEGIN sessions -->
-		<!-- IF sessions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td class="genmed" style="text-align: center"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}"/></td>
-			<td class="genmed"><label for="{sessions.KEY}">{sessions.KEY}</label></td>
-			<td class="genmed" style="text-align: center">{sessions.IP}</td>
-			<td class="genmed" style="text-align: center">{sessions.LOGIN_TIME}</td>
-		</tr>
-	<!-- END sessions -->
-<!-- ELSE -->
+<!-- BEGINELSE -->
 	<tr>
 		<td colspan="4" class="row1">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td>
 	</tr>
-<!-- ENDIF -->
+<!-- END sessions -->
 
 <!-- IF .sessions -->
 	<tr>
-- 
cgit v1.2.1


From 73ca5edb296bfe2d599e001d593cc2d952be3941 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Thu, 17 May 2012 14:08:50 +0530
Subject: [feature/delete-auto-logins] fixes style

removes reset button and some minor style fixes in subsilver2 and
prosilver.

PHPBB3-9647
---
 phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
index 2d3b9f98f8..1dab9acb9c 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
@@ -32,15 +32,14 @@
 	</tr>
 <!-- BEGINELSE -->
 	<tr>
-		<td colspan="4" class="row1">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td>
+		<td colspan="4" class="row1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td>
 	</tr>
 <!-- END sessions -->
 
 <!-- IF .sessions -->
 	<tr>
 		<td class="cat" colspan="4" align="center">
-			{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-			<input type="submit" name="submit" value="{L_DELETE}" class="button1" />
+			{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_DELETE}" />
 			{S_FORM_TOKEN}
 		</td>
 	</tr>
-- 
cgit v1.2.1


From a32a5925b357f78eb8735c0aaf1595935305c126 Mon Sep 17 00:00:00 2001
From: Vinny <vinny@suportephpbb.com.br>
Date: Tue, 22 May 2012 15:34:39 -0300
Subject: [ticket/10905] Last topic title for subsilver2

PHPBB3-10905
---
 phpBB/styles/subsilver2/template/forumlist_body.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index 334fd7a968..be32d1fb77 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -56,6 +56,9 @@
 			<td class="row2" align="center"><p class="topicdetails">{forumrow.POSTS}</p></td>
 			<td class="row2" align="center" nowrap="nowrap">
 				<!-- IF forumrow.LAST_POST_TIME -->
+					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
+						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
+					<!-- ENDIF -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
-- 
cgit v1.2.1


From d8ddda512180be56100a890410dece8046aade28 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 31 May 2012 20:19:28 +0200
Subject: [develop-olympus] Bumping version numbers to final for 3.0.11
 releases.

---
 phpBB/styles/subsilver2/imageset/imageset.cfg | 2 +-
 phpBB/styles/subsilver2/style.cfg             | 2 +-
 phpBB/styles/subsilver2/template/template.cfg | 2 +-
 phpBB/styles/subsilver2/theme/theme.cfg       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg
index 75a4aad038..c943db6735 100644
--- a/phpBB/styles/subsilver2/imageset/imageset.cfg
+++ b/phpBB/styles/subsilver2/imageset/imageset.cfg
@@ -19,7 +19,7 @@
 # General Information about this style
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.10
+version = 3.0.11
 
 # Images
 img_site_logo = site_logo.gif*94*170
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 13e44435c6..4c40ee4438 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -19,4 +19,4 @@
 # General Information about this style
 name = subsilver2
 copyright = &copy; 2005 phpBB Group
-version = 3.0.10
+version = 3.0.11
diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg
index d557edba87..6568aeca08 100644
--- a/phpBB/styles/subsilver2/template/template.cfg
+++ b/phpBB/styles/subsilver2/template/template.cfg
@@ -19,7 +19,7 @@
 # General Information about this template
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.10
+version = 3.0.11
 
 # Template inheritance
 # See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg
index d7837a3766..5bd4480eef 100644
--- a/phpBB/styles/subsilver2/theme/theme.cfg
+++ b/phpBB/styles/subsilver2/theme/theme.cfg
@@ -21,7 +21,7 @@
 # General Information about this theme
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.10
+version = 3.0.11
 
 # Some configuration options
 
-- 
cgit v1.2.1


From 53d846477665ea6b8a3463318f03050282aec89a Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sat, 11 Feb 2012 21:12:36 +0000
Subject: [ticket/10640] Change maximum subject length

PHPBB3-10640
---
 phpBB/styles/subsilver2/template/posting_body.html      | 2 +-
 phpBB/styles/subsilver2/template/quickreply_editor.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 712c02b856..ae7d2f88d6 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -173,7 +173,7 @@
 
 <tr>
 	<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td>
-	<td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}" /></td>
+	<td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}" /></td>
 </tr>
 <tr>
 	<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}:</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}&nbsp;</span><br /><br />
diff --git a/phpBB/styles/subsilver2/template/quickreply_editor.html b/phpBB/styles/subsilver2/template/quickreply_editor.html
index 4c3f7a3d0b..7a68a8f605 100644
--- a/phpBB/styles/subsilver2/template/quickreply_editor.html
+++ b/phpBB/styles/subsilver2/template/quickreply_editor.html
@@ -6,7 +6,7 @@
 		</tr>
 		<tr>
 			<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td>
-			<td  class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" /></td>
+			<td  class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="124" tabindex="2" value="{SUBJECT}" /></td>
 		</tr>
 		<tr>
 			<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}:</b></td>
-- 
cgit v1.2.1


From a41f86f2f724c31b2bb6e55d278b65e2660697c1 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 17 Jun 2012 19:22:50 +0100
Subject: [ticket/10640] Change subject length in mcp in subsilver

PHPBB3-10640
---
 phpBB/styles/subsilver2/template/mcp_topic.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html
index 8ff648da39..6bbf13e12c 100644
--- a/phpBB/styles/subsilver2/template/mcp_topic.html
+++ b/phpBB/styles/subsilver2/template/mcp_topic.html
@@ -12,7 +12,7 @@
 	</tr>
 	<tr>
 		<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_SUBJECT}</span></td>
-		<td class="row2" colspan="2"><input class="post" style="width: 350px" type="text" size="35" maxlength="64" name="subject" value="{SPLIT_SUBJECT}" /></td>
+		<td class="row2" colspan="2"><input class="post" style="width: 350px" type="text" size="35" maxlength="124" name="subject" value="{SPLIT_SUBJECT}" /></td>
 	</tr>
 	<tr>
 		<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td>
-- 
cgit v1.2.1


From a6bace039ab18ce5138a7f6ffa6d74c543bd6222 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 12 Jun 2012 19:51:55 +0200
Subject: [feature/new-tz-handling] Fix timezone selection in subsilver2

PHPBB3-9558
---
 phpBB/styles/subsilver2/template/timezone.js       | 95 ++++++++++++++++++++++
 .../subsilver2/template/timezone_option.html       | 22 +++++
 .../subsilver2/template/ucp_prefs_personal.html    |  7 +-
 phpBB/styles/subsilver2/template/ucp_register.html |  7 +-
 4 files changed, 121 insertions(+), 10 deletions(-)
 create mode 100644 phpBB/styles/subsilver2/template/timezone.js
 create mode 100644 phpBB/styles/subsilver2/template/timezone_option.html

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/timezone.js b/phpBB/styles/subsilver2/template/timezone.js
new file mode 100644
index 0000000000..deebbf36a8
--- /dev/null
+++ b/phpBB/styles/subsilver2/template/timezone.js
@@ -0,0 +1,95 @@
+function phpbb_switch_tz_date(keep_selection)
+{
+	var timezone_groups = document.getElementById("timezone");
+	for (var i = 0; i < timezone_groups.childElementCount; i++) {
+		if (timezone_groups.children[i].tagName == "OPTGROUP" &&
+			timezone_groups.children[i].label != document.getElementById("tz_date").value)
+		{
+			timezone_groups.children[i].style.display = "none";
+		}
+		else if (timezone_groups.children[i].tagName == "OPTGROUP")
+		{
+			// Display other options
+			timezone_groups.children[i].style.display = "block";
+		}
+	}
+	if (typeof keep_selection !== 'undefined')
+	{
+		if (!keep_selection)
+		{
+			timezone_groups.children[0].selected = true;
+		}
+	}
+}
+
+function phpbb_enable_tz_dates()
+{
+	var tz_select_date = document.getElementById("tz_select_date");
+	tz_select_date.style.display = "block";
+}
+
+function phpbb_preselect_tz_select(force_selector, l_suggestion)
+{
+
+	var selector = document.getElementById('tz_date');
+	// The offset returned here is in minutes and negated.
+	// http://www.w3schools.com/jsref/jsref_getTimezoneOffset.asp
+	var offset = (new Date()).getTimezoneOffset();
+	if (offset < 0)
+	{
+		var sign = '+';
+		offset = -offset;
+	}
+	else
+	{
+		var sign = '-';
+	}
+	var minutes = offset % 60;
+	var hours = (offset - minutes) / 60;
+	if (hours < 10)
+	{
+		hours = '0' + hours.toString();
+	}
+	else
+	{
+		hours = hours.toString();
+	}
+	if (minutes < 10)
+	{
+		minutes = '0' + minutes.toString();
+	}
+	else
+	{
+		minutes = minutes.toString();
+	}
+	var prefix = 'GMT' + sign + hours + ':' + minutes;
+	var prefix_length = prefix.length;
+	for (var i = 0; i < selector.options.length; ++i)
+	{
+		var option = selector.options[i];
+		if (option.value.substring(0, prefix_length) == prefix)
+		{
+			if (selector.value && selector.value != option.value && !force_selector)
+			{
+				// We do not select the option for the user, but notify him,
+				// that we would suggest a different setting.
+				document.getElementById("tz_select_date_suggest").style.display = "inline";
+				document.getElementById("tz_select_date_suggest").title = l_suggestion.replace("%s", option.innerHTML);
+				document.getElementById("tz_select_date_suggest").innerHTML = l_suggestion.replace("%s", option.innerHTML.substring(0, 9));
+				phpbb_switch_tz_date(true);
+			}
+			else
+			{
+				// Firefox scrolls the selector only to put the option into view;
+				// for negative-offset timezones, this means the first timezone
+				// of a particular offset will be the bottom one, and selected,
+				// with all other timezones not visible. Not much can be done
+				// about that here unfortunately.
+				option.selected = true;
+				phpbb_switch_tz_date(!force_selector);
+				document.getElementById("tz_select_date_suggest").style.display = "none";
+			}
+			break;
+		}
+	}
+}
diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html
new file mode 100644
index 0000000000..184722ef7e
--- /dev/null
+++ b/phpBB/styles/subsilver2/template/timezone_option.html
@@ -0,0 +1,22 @@
+<tr>
+	<td class="row1" width="50%"><b class="genmed">{L_BOARD_TIMEZONE}:</b></td>
+	<td class="row2">
+		<!-- IF S_TZ_DATE_OPTIONS -->
+		<div id="tz_select_date" style="display: none;">
+			<select name="tz_date" id="tz_date" class="autowidth tz_select" onchange="phpbb_switch_tz_date(false);">
+				<option value="">{L_SELECT_CURRENT_TIME}</option>
+				{S_TZ_DATE_OPTIONS}
+			</select><br />
+			<a id="tz_select_date_suggest" style="display: none;" href="javascript: phpbb_preselect_tz_select(true, '');">{L_TIMEZONE_DATE_SUGGESTION}</a><br />
+		</div>
+		<!-- ENDIF -->
+		<select name="tz" id="timezone" class="autowidth tz_select">
+			<option value="">{L_SELECT_TIMEZONE}</option>
+			{S_TZ_OPTIONS}
+		</select>
+
+		<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/timezone.js"></script>
+		<script type="text/javascript">phpbb_enable_tz_dates();</script>
+		<script type="text/javascript">phpbb_preselect_tz_select(<!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->, '{L_TIMEZONE_DATE_SUGGESTION}');</script>
+	</td>
+</tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
index 357e1fe100..bf0e67d68b 100644
--- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
@@ -71,12 +71,7 @@
 	<td class="row2"><select name="style">{S_STYLE_OPTIONS}</select></td>
 </tr>
 <!-- ENDIF -->
-<tr>
-	<td class="row1" width="50%"><b class="genmed">{L_BOARD_TIMEZONE}:</b></td>
-	<td class="row2">
-		<select id="tz" name="tz">{S_TZ_OPTIONS}</select>
-	</td>
-</tr>
+<!-- INCLUDE timezone_option.html -->
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}:</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td>
 	<td class="row2">
diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html
index 0c3533292d..095c97ed49 100644
--- a/phpBB/styles/subsilver2/template/ucp_register.html
+++ b/phpBB/styles/subsilver2/template/ucp_register.html
@@ -53,10 +53,9 @@
 	<td class="row1"><b class="genmed">{L_LANGUAGE}: </b></td>
 	<td class="row2"><select name="lang" onchange="change_language(this.value); return false;">{S_LANG_OPTIONS}</select></td>
 </tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_TIMEZONE}: </b></td>
-	<td class="row2"><select name="tz">{S_TZ_OPTIONS}</select></td>
-</tr>
+
+<!-- INCLUDE timezone_option.html -->
+
 <!-- IF .profile_fields -->
 	<tr>
 		<td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
-- 
cgit v1.2.1


From 5441ee1ee489ef9ad1727f110c440dde5417cc1f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 17 Jun 2012 16:54:12 +0200
Subject: [feature/new-tz-handling] Use jQuery and INCLUDEJS for javascript

PHPBB3-9558
---
 phpBB/styles/subsilver2/template/timezone.js       | 47 +++++++++++-----------
 .../subsilver2/template/timezone_option.html       |  8 ++--
 2 files changed, 29 insertions(+), 26 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/timezone.js b/phpBB/styles/subsilver2/template/timezone.js
index deebbf36a8..f73a82a063 100644
--- a/phpBB/styles/subsilver2/template/timezone.js
+++ b/phpBB/styles/subsilver2/template/timezone.js
@@ -1,37 +1,32 @@
 function phpbb_switch_tz_date(keep_selection)
 {
-	var timezone_groups = document.getElementById("timezone");
-	for (var i = 0; i < timezone_groups.childElementCount; i++) {
-		if (timezone_groups.children[i].tagName == "OPTGROUP" &&
-			timezone_groups.children[i].label != document.getElementById("tz_date").value)
-		{
-			timezone_groups.children[i].style.display = "none";
-		}
-		else if (timezone_groups.children[i].tagName == "OPTGROUP")
-		{
-			// Display other options
-			timezone_groups.children[i].style.display = "block";
-		}
+	$('#timezone > optgroup').css("display", "none");
+	$("#timezone > optgroup[label='" + $('#tz_date').val() + "']").css("display", "block");
+
+	if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() == 1)
+	{
+		// If there is only one timezone for the selected date, we just select that automatically.
+		$("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").attr("selected", true);
+		keep_selection = true;
 	}
+
 	if (typeof keep_selection !== 'undefined')
 	{
 		if (!keep_selection)
 		{
-			timezone_groups.children[0].selected = true;
+			$('#timezone > option:first').attr("selected", true);
 		}
 	}
 }
 
 function phpbb_enable_tz_dates()
 {
-	var tz_select_date = document.getElementById("tz_select_date");
-	tz_select_date.style.display = "block";
+	$('#tz_select_date').css("display", "block");
 }
 
 function phpbb_preselect_tz_select(force_selector, l_suggestion)
 {
 
-	var selector = document.getElementById('tz_date');
 	// The offset returned here is in minutes and negated.
 	// http://www.w3schools.com/jsref/jsref_getTimezoneOffset.asp
 	var offset = (new Date()).getTimezoneOffset();
@@ -62,20 +57,23 @@ function phpbb_preselect_tz_select(force_selector, l_suggestion)
 	{
 		minutes = minutes.toString();
 	}
+
 	var prefix = 'GMT' + sign + hours + ':' + minutes;
 	var prefix_length = prefix.length;
-	for (var i = 0; i < selector.options.length; ++i)
+
+	var selector_options = $('#tz_date > option');
+	for (var i = 0; i < selector_options.length; ++i)
 	{
-		var option = selector.options[i];
+		var option = selector_options[i];
 		if (option.value.substring(0, prefix_length) == prefix)
 		{
-			if (selector.value && selector.value != option.value && !force_selector)
+			if ($('#tz_date').val() != option.value && !force_selector)
 			{
 				// We do not select the option for the user, but notify him,
 				// that we would suggest a different setting.
-				document.getElementById("tz_select_date_suggest").style.display = "inline";
-				document.getElementById("tz_select_date_suggest").title = l_suggestion.replace("%s", option.innerHTML);
-				document.getElementById("tz_select_date_suggest").innerHTML = l_suggestion.replace("%s", option.innerHTML.substring(0, 9));
+				$('#tz_select_date_suggest').css("display", "inline");
+				$('#tz_select_date_suggest').attr("title", l_suggestion.replace("%s", option.innerHTML));
+				$('#tz_select_date_suggest').html(l_suggestion.replace("%s", option.innerHTML.substring(0, 9)));
 				phpbb_switch_tz_date(true);
 			}
 			else
@@ -87,9 +85,12 @@ function phpbb_preselect_tz_select(force_selector, l_suggestion)
 				// about that here unfortunately.
 				option.selected = true;
 				phpbb_switch_tz_date(!force_selector);
-				document.getElementById("tz_select_date_suggest").style.display = "none";
+				$('#tz_select_date_suggest').css("display", "none");
 			}
 			break;
 		}
 	}
 }
+
+phpbb_enable_tz_dates();
+phpbb_preselect_tz_select(is_registration, l_timezone_date_suggestion);
diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html
index 184722ef7e..0806186c9c 100644
--- a/phpBB/styles/subsilver2/template/timezone_option.html
+++ b/phpBB/styles/subsilver2/template/timezone_option.html
@@ -15,8 +15,10 @@
 			{S_TZ_OPTIONS}
 		</select>
 
-		<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/timezone.js"></script>
-		<script type="text/javascript">phpbb_enable_tz_dates();</script>
-		<script type="text/javascript">phpbb_preselect_tz_select(<!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->, '{L_TIMEZONE_DATE_SUGGESTION}');</script>
+		<script type="text/javascript">
+			var is_registration = <!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->;
+			var l_timezone_date_suggestion = "{L_TIMEZONE_DATE_SUGGESTION}";
+		</script>
+		<!-- INCLUDEJS template/timezone.js -->
 	</td>
 </tr>
-- 
cgit v1.2.1


From 8d65f1f7d263d9f6e76cbac2765da02a0877c87f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 18 Jun 2012 10:20:15 +0200
Subject: [feature/new-tz-handling] Add doc blocks to js functions

PHPBB3-9558
---
 phpBB/styles/subsilver2/template/timezone.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/timezone.js b/phpBB/styles/subsilver2/template/timezone.js
index f73a82a063..b91aae6244 100644
--- a/phpBB/styles/subsilver2/template/timezone.js
+++ b/phpBB/styles/subsilver2/template/timezone.js
@@ -1,3 +1,8 @@
+/**
+* Hide the optgroups that are not the selected timezone
+*
+* @param	bool	keep_selection		Shall we keep the value selected, or shall the user be forced to repick one.
+*/
 function phpbb_switch_tz_date(keep_selection)
 {
 	$('#timezone > optgroup').css("display", "none");
@@ -19,11 +24,20 @@ function phpbb_switch_tz_date(keep_selection)
 	}
 }
 
+/**
+* Display the date/time select
+*/
 function phpbb_enable_tz_dates()
 {
 	$('#tz_select_date').css("display", "block");
 }
 
+/**
+* Preselect a date/time or suggest one, if it is not picked.
+*
+* @param	bool	force_selector		Shall we select the suggestion?
+* @param	string	l_suggestion		The language string which we use, to display the selection
+*/
 function phpbb_preselect_tz_select(force_selector, l_suggestion)
 {
 
@@ -78,11 +92,6 @@ function phpbb_preselect_tz_select(force_selector, l_suggestion)
 			}
 			else
 			{
-				// Firefox scrolls the selector only to put the option into view;
-				// for negative-offset timezones, this means the first timezone
-				// of a particular offset will be the bottom one, and selected,
-				// with all other timezones not visible. Not much can be done
-				// about that here unfortunately.
 				option.selected = true;
 				phpbb_switch_tz_date(!force_selector);
 				$('#tz_select_date_suggest').css("display", "none");
-- 
cgit v1.2.1


From c21275fa951bd4d8608cc335a5c39d9a05bc4904 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 18 Jun 2012 10:53:47 +0200
Subject: [feature/new-tz-handling] Use js and data attributes to create the
 events

PHPBB3-9558
---
 phpBB/styles/subsilver2/template/timezone.js          | 13 ++++++++-----
 phpBB/styles/subsilver2/template/timezone_option.html |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/timezone.js b/phpBB/styles/subsilver2/template/timezone.js
index b91aae6244..b8d3c2f152 100644
--- a/phpBB/styles/subsilver2/template/timezone.js
+++ b/phpBB/styles/subsilver2/template/timezone.js
@@ -36,9 +36,8 @@ function phpbb_enable_tz_dates()
 * Preselect a date/time or suggest one, if it is not picked.
 *
 * @param	bool	force_selector		Shall we select the suggestion?
-* @param	string	l_suggestion		The language string which we use, to display the selection
 */
-function phpbb_preselect_tz_select(force_selector, l_suggestion)
+function phpbb_preselect_tz_select(force_selector)
 {
 
 	// The offset returned here is in minutes and negated.
@@ -86,8 +85,8 @@ function phpbb_preselect_tz_select(force_selector, l_suggestion)
 				// We do not select the option for the user, but notify him,
 				// that we would suggest a different setting.
 				$('#tz_select_date_suggest').css("display", "inline");
-				$('#tz_select_date_suggest').attr("title", l_suggestion.replace("%s", option.innerHTML));
-				$('#tz_select_date_suggest').html(l_suggestion.replace("%s", option.innerHTML.substring(0, 9)));
+				$('#tz_select_date_suggest').attr("title", $('#tz_select_date_suggest').attr('data-l-suggestion').replace("%s", option.innerHTML));
+				$('#tz_select_date_suggest').attr("value", $('#tz_select_date_suggest').attr('data-l-suggestion').replace("%s", option.innerHTML.substring(0, 9)));
 				phpbb_switch_tz_date(true);
 			}
 			else
@@ -101,5 +100,9 @@ function phpbb_preselect_tz_select(force_selector, l_suggestion)
 	}
 }
 
+$('#tz_select_date_suggest').click(function(){
+	phpbb_preselect_tz_select(true, '');
+});
+
 phpbb_enable_tz_dates();
-phpbb_preselect_tz_select(is_registration, l_timezone_date_suggestion);
+phpbb_preselect_tz_select($('#tz_select_date_suggest').attr('data-is-registration') == "true");
diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html
index 0806186c9c..affeee91ac 100644
--- a/phpBB/styles/subsilver2/template/timezone_option.html
+++ b/phpBB/styles/subsilver2/template/timezone_option.html
@@ -7,7 +7,7 @@
 				<option value="">{L_SELECT_CURRENT_TIME}</option>
 				{S_TZ_DATE_OPTIONS}
 			</select><br />
-			<a id="tz_select_date_suggest" style="display: none;" href="javascript: phpbb_preselect_tz_select(true, '');">{L_TIMEZONE_DATE_SUGGESTION}</a><br />
+			<input id="tz_select_date_suggest" class="btnlite" style="display: none;" data-is-registration="<!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
 		</div>
 		<!-- ENDIF -->
 		<select name="tz" id="timezone" class="autowidth tz_select">
-- 
cgit v1.2.1


From 58a3342c3e982b927aa5903a9c6bdf06c233d907 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 18 Jun 2012 12:26:28 -0400
Subject: [ticket/10938] Serve subforum listing on forumlist from template loop

Subforum listing is available both via implode()-ed PHP loop and
via template loop. The latter allows more flexibility for changing
the subforum listing per style, so that is the better option.

PHPBB3-10938
---
 phpBB/styles/subsilver2/template/forumlist_body.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index be32d1fb77..b9a1102df0 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -48,8 +48,12 @@
 				<!-- IF forumrow.MODERATORS -->
 					<p class="forumdesc"><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS}</p>
 				<!-- ENDIF -->
-				<!-- IF forumrow.SUBFORUMS and forumrow.S_LIST_SUBFORUMS -->
-					<p class="forumdesc"><strong>{forumrow.L_SUBFORUM_STR}</strong> {forumrow.SUBFORUMS}</p>
+				<!-- IF .forumrow.subforum and forumrow.S_LIST_SUBFORUMS -->
+					<p class="forumdesc"><strong>{forumrow.L_SUBFORUM_STR}</strong>
+					<!-- BEGIN subforum -->
+						<a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->,<!-- ENDIF -->
+					<!-- END subforum -->
+					</p>
 				<!-- ENDIF -->
 			</td>
 			<td class="row2" align="center"><p class="topicdetails">{forumrow.TOPICS}</p></td>
-- 
cgit v1.2.1


From dcd7d962960ade175400cbb9b8e00575e8735a22 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 19 Jun 2012 19:08:53 +0200
Subject: [feature/new-tz-handling] Use asset in acp and subsilver2 and remove
 duplicates

PHPBB3-9558
---
 phpBB/styles/subsilver2/template/timezone.js       | 117 +++------------------
 .../subsilver2/template/timezone_option.html       |   6 +-
 2 files changed, 15 insertions(+), 108 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/timezone.js b/phpBB/styles/subsilver2/template/timezone.js
index b8d3c2f152..da0a2b0bfd 100644
--- a/phpBB/styles/subsilver2/template/timezone.js
+++ b/phpBB/styles/subsilver2/template/timezone.js
@@ -1,108 +1,19 @@
-/**
-* Hide the optgroups that are not the selected timezone
-*
-* @param	bool	keep_selection		Shall we keep the value selected, or shall the user be forced to repick one.
-*/
-function phpbb_switch_tz_date(keep_selection)
-{
-	$('#timezone > optgroup').css("display", "none");
-	$("#timezone > optgroup[label='" + $('#tz_date').val() + "']").css("display", "block");
+(function($) { // Avoid conflicts with other libraries
 
-	if ($("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option").size() == 1)
-	{
-		// If there is only one timezone for the selected date, we just select that automatically.
-		$("#timezone > optgroup[label='" + $('#tz_date').val() + "'] > option:first").attr("selected", true);
-		keep_selection = true;
-	}
-
-	if (typeof keep_selection !== 'undefined')
-	{
-		if (!keep_selection)
-		{
-			$('#timezone > option:first').attr("selected", true);
-		}
-	}
-}
-
-/**
-* Display the date/time select
-*/
-function phpbb_enable_tz_dates()
-{
-	$('#tz_select_date').css("display", "block");
-}
-
-/**
-* Preselect a date/time or suggest one, if it is not picked.
-*
-* @param	bool	force_selector		Shall we select the suggestion?
-*/
-function phpbb_preselect_tz_select(force_selector)
-{
-
-	// The offset returned here is in minutes and negated.
-	// http://www.w3schools.com/jsref/jsref_getTimezoneOffset.asp
-	var offset = (new Date()).getTimezoneOffset();
-	if (offset < 0)
-	{
-		var sign = '+';
-		offset = -offset;
-	}
-	else
-	{
-		var sign = '-';
-	}
-	var minutes = offset % 60;
-	var hours = (offset - minutes) / 60;
-	if (hours < 10)
-	{
-		hours = '0' + hours.toString();
-	}
-	else
-	{
-		hours = hours.toString();
-	}
-	if (minutes < 10)
-	{
-		minutes = '0' + minutes.toString();
-	}
-	else
-	{
-		minutes = minutes.toString();
-	}
-
-	var prefix = 'GMT' + sign + hours + ':' + minutes;
-	var prefix_length = prefix.length;
-
-	var selector_options = $('#tz_date > option');
-	for (var i = 0; i < selector_options.length; ++i)
-	{
-		var option = selector_options[i];
-		if (option.value.substring(0, prefix_length) == prefix)
-		{
-			if ($('#tz_date').val() != option.value && !force_selector)
-			{
-				// We do not select the option for the user, but notify him,
-				// that we would suggest a different setting.
-				$('#tz_select_date_suggest').css("display", "inline");
-				$('#tz_select_date_suggest').attr("title", $('#tz_select_date_suggest').attr('data-l-suggestion').replace("%s", option.innerHTML));
-				$('#tz_select_date_suggest').attr("value", $('#tz_select_date_suggest').attr('data-l-suggestion').replace("%s", option.innerHTML.substring(0, 9)));
-				phpbb_switch_tz_date(true);
-			}
-			else
-			{
-				option.selected = true;
-				phpbb_switch_tz_date(!force_selector);
-				$('#tz_select_date_suggest').css("display", "none");
-			}
-			break;
-		}
-	}
-}
+$('#tz_date').change(function() {
+	phpbb.timezone_switch_date(false);
+});
 
 $('#tz_select_date_suggest').click(function(){
-	phpbb_preselect_tz_select(true, '');
+	phpbb.timezone_preselect_select(true);
 });
 
-phpbb_enable_tz_dates();
-phpbb_preselect_tz_select($('#tz_select_date_suggest').attr('data-is-registration') == "true");
+$(document).ready(
+	phpbb.timezone_enable_date_selection
+);
+
+$(document).ready(
+	phpbb.timezone_preselect_select($('#tz_select_date_suggest').attr('data-is-registration') == 'true')
+);
+
+})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html
index affeee91ac..3f1e14b33d 100644
--- a/phpBB/styles/subsilver2/template/timezone_option.html
+++ b/phpBB/styles/subsilver2/template/timezone_option.html
@@ -3,7 +3,7 @@
 	<td class="row2">
 		<!-- IF S_TZ_DATE_OPTIONS -->
 		<div id="tz_select_date" style="display: none;">
-			<select name="tz_date" id="tz_date" class="autowidth tz_select" onchange="phpbb_switch_tz_date(false);">
+			<select name="tz_date" id="tz_date" class="autowidth tz_select">
 				<option value="">{L_SELECT_CURRENT_TIME}</option>
 				{S_TZ_DATE_OPTIONS}
 			</select><br />
@@ -15,10 +15,6 @@
 			{S_TZ_OPTIONS}
 		</select>
 
-		<script type="text/javascript">
-			var is_registration = <!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->;
-			var l_timezone_date_suggestion = "{L_TIMEZONE_DATE_SUGGESTION}";
-		</script>
 		<!-- INCLUDEJS template/timezone.js -->
 	</td>
 </tr>
-- 
cgit v1.2.1


From f1056a9b2fd6e4ff7bc107372e9210bae9e077f0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 5 Jul 2012 00:30:02 +0200
Subject: [ticket/10811] Make toogle_subscribe more generic so it can toogle
 all links

PHPBB3-10811
---
 phpBB/styles/subsilver2/template/viewforum_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html
index f132185716..afb8426799 100644
--- a/phpBB/styles/subsilver2/template/viewforum_body.html
+++ b/phpBB/styles/subsilver2/template/viewforum_body.html
@@ -154,7 +154,7 @@
 			<td class="cat" colspan="<!-- IF S_TOPIC_ICONS -->7<!-- ELSE -->6<!-- ENDIF -->">
 				<table width="100%" cellspacing="0">
 				<tr class="nav">
-					<td valign="middle">&nbsp;<!-- IF S_WATCH_FORUM_LINK and not S_IS_BOT --><a href="{S_WATCH_FORUM_LINK}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF --></td>
+					<td valign="middle">&nbsp;<!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --><a href="{U_WATCH_FORUM_LINK}">{S_WATCH_FORUM_TITLE}</a><!-- ENDIF --></td>
 					<td align="{S_CONTENT_FLOW_END}" valign="middle"><!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a><!-- ENDIF -->&nbsp;</td>
 				</tr>
 				</table>
-- 
cgit v1.2.1


From 922147f05a75d5a0e00b34f0102bc014583df984 Mon Sep 17 00:00:00 2001
From: Drae <paul@starstreak.net>
Date: Wed, 4 Jul 2012 23:19:59 +0100
Subject: [ticket/10968] Render pagination within the template

Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
---
 phpBB/styles/subsilver2/template/pagination.html   | 12 +++++++++-
 .../subsilver2/template/posting_smilies.html       | 15 ++++++++++++-
 .../styles/subsilver2/template/search_results.html | 13 +++++++++--
 .../subsilver2/template/ucp_main_bookmarks.html    | 13 +++++++++--
 .../subsilver2/template/ucp_main_subscribed.html   | 13 +++++++++--
 .../styles/subsilver2/template/viewforum_body.html | 26 ++++++++++++++++++----
 .../subsilver2/template/viewonline_body.html       |  4 ++--
 7 files changed, 82 insertions(+), 14 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/pagination.html b/phpBB/styles/subsilver2/template/pagination.html
index a36eb88d8f..f78bb554fc 100644
--- a/phpBB/styles/subsilver2/template/pagination.html
+++ b/phpBB/styles/subsilver2/template/pagination.html
@@ -1 +1,11 @@
-<!-- IF PAGINATION --><b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE --> &nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF -->
+<!-- IF .pagination -->
+	<b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> 
+	<!-- BEGIN pagination -->
+		<!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
+		<!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong>
+		<!-- ELSEIF pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
+		<!-- ELSEIF pagination.S_IS_NEXT --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
+		<!-- ELSE --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
+		<!-- ENDIF -->
+	<!-- END pagination -->
+<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html
index 691ba239b2..30a80e26ab 100644
--- a/phpBB/styles/subsilver2/template/posting_smilies.html
+++ b/phpBB/styles/subsilver2/template/posting_smilies.html
@@ -16,7 +16,20 @@
 			<th>{L_SMILIES}</th>
 		</tr>
 		<tr>
-			<td class="row1" align="center" valign="middle"><!-- BEGIN smiley --> <a href="#" onclick="initInsertions(); insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" /></a> <!-- END smiley --><br />{PAGINATION}<br /><a class="nav" href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a></td>
+			<td class="row1" align="center" valign="middle"><!-- BEGIN smiley --> <a href="#" onclick="initInsertions(); insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" /></a> <!-- END smiley --><br />
+			<!-- IF .pagination -->
+				<b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> 
+				<!-- BEGIN pagination -->
+					<!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
+					<!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong>
+					<!-- ELSEIF pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
+					<!-- ELSEIF pagination.S_IS_NEXT --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
+					<!-- ELSE --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
+					<!-- ENDIF -->
+				<!-- END pagination -->
+			<br />	
+			<!-- ENDIF -->
+			<a class="nav" href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a></td>
 		</tr>
 		</table>
 	</td>
diff --git a/phpBB/styles/subsilver2/template/search_results.html b/phpBB/styles/subsilver2/template/search_results.html
index d8a1879ca7..a143a186d7 100644
--- a/phpBB/styles/subsilver2/template/search_results.html
+++ b/phpBB/styles/subsilver2/template/search_results.html
@@ -42,8 +42,17 @@
 				<!-- IF searchresults.S_TOPIC_REPORTED -->
 					<a href="{searchresults.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
 				<!-- ENDIF -->
-				<!-- IF searchresults.PAGINATION -->
-					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {searchresults.PAGINATION} ] </p>
+				<!-- IF .searchresults.pagination -->
+					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: 
+					<!-- BEGIN pagination -->
+						<!-- IF searchresults.pagination.S_IS_PREV -->
+						<!-- ELSEIF searchresults.pagination.S_IS_CURRENT --><strong>{searchresults.pagination.PAGE_NUMBER}</strong>
+						<!-- ELSEIF searchresults.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
+						<!-- ELSEIF searchresults.pagination.S_IS_NEXT -->
+						<!-- ELSE --><a href="{searchresults.pagination.PAGE_URL}">{searchresults.pagination.PAGE_NUMBER}</a>
+						<!-- ENDIF -->
+					<!-- END pagination -->
+					] </p>
 				<!-- ENDIF -->
 				<p class="gensmall">{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></p>
 			</td>
diff --git a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html b/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html
index 2fa8f6ac2e..ba19c45eab 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html
@@ -43,8 +43,17 @@
 			<td style="padding: 4px;" width="100%" valign="top">
 				<p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p>
 				<!-- IF topicrow.S_GLOBAL_TOPIC --><span class="gensmall">{L_GLOBAL_ANNOUNCEMENT}</span><!-- ELSE --><span class="gensmall"><b>{L_FORUM}: </b><a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span><!-- ENDIF -->
-				<!-- IF topicrow.PAGINATION -->
-					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p>
+				<!-- IF .topicrow.pagination -->
+					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: 
+					<!-- BEGIN pagination -->
+						<!-- IF topicrow.pagination.S_IS_PREV -->
+						<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong>
+						<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
+						<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
+						<!-- ELSE --><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a>
+						<!-- ENDIF -->
+					<!-- END pagination -->
+					] </p>
 				<!-- ENDIF -->
 			</td>
 			<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap">
diff --git a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html
index 42a452549b..13d2935757 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html
@@ -52,8 +52,17 @@
 			<td style="padding: 4px;" width="100%" valign="top">
 				<p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p>
 				<!-- IF topicrow.S_GLOBAL_TOPIC --><span class="gensmall">{L_GLOBAL_ANNOUNCEMENT}</span><!-- ELSE --><span class="gensmall"><b>{L_FORUM}: </b><a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span><!-- ENDIF -->
-				<!-- IF topicrow.PAGINATION -->
-					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p>
+				<!-- IF .topicrow.pagination -->
+					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: 
+					<!-- BEGIN pagination -->
+						<!-- IF topicrow.pagination.S_IS_PREV -->
+						<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong>
+						<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
+						<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
+						<!-- ELSE --><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a>
+						<!-- ENDIF -->
+					<!-- END pagination -->
+					] </p>
 				<!-- ENDIF -->
 			</td>
 			<td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap">
diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html
index afb8426799..7f241ce874 100644
--- a/phpBB/styles/subsilver2/template/viewforum_body.html
+++ b/phpBB/styles/subsilver2/template/viewforum_body.html
@@ -48,8 +48,17 @@
 				<!-- IF topicrow.S_TOPIC_REPORTED -->
 					<a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
 				<!-- ENDIF -->
-				<!-- IF topicrow.PAGINATION -->
-					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p>
+				<!-- IF .topicrow.pagination -->
+					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: 
+					<!-- BEGIN pagination -->
+						<!-- IF topicrow.pagination.S_IS_PREV -->
+						<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong>
+						<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
+						<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
+						<!-- ELSE --><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a>
+						<!-- ENDIF -->
+					<!-- END pagination -->
+					] </p>
 				<!-- ENDIF -->
 			</td>
 			<td class="row2" width="130" align="center"><p class="topicauthor">{topicrow.TOPIC_AUTHOR_FULL}</p></td>
@@ -199,8 +208,17 @@
 					<!-- IF topicrow.S_TOPIC_REPORTED -->
 						<a href="{topicrow.U_MCP_REPORT}" class="imageset">{REPORTED_IMG}</a>&nbsp;
 					<!-- ENDIF -->
-					<!-- IF topicrow.PAGINATION -->
-						<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p>
+					<!-- IF .topicrow.pagination -->
+						<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: 
+						<!-- BEGIN pagination -->
+							<!-- IF topicrow.pagination.S_IS_PREV -->
+							<!-- ELSEIF topicrow.pagination.S_IS_CURRENT --><strong>{topicrow.pagination.PAGE_NUMBER}</strong>
+							<!-- ELSEIF topicrow.pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
+							<!-- ELSEIF topicrow.pagination.S_IS_NEXT -->
+							<!-- ELSE --><a href="{topicrow.pagination.PAGE_URL}">{topicrow.pagination.PAGE_NUMBER}</a>
+							<!-- ENDIF -->
+						<!-- END pagination -->
+						] </p>
 					<!-- ENDIF -->
 					<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><p class="gensmall">{L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></p><!-- ENDIF -->
 				</td>
diff --git a/phpBB/styles/subsilver2/template/viewonline_body.html b/phpBB/styles/subsilver2/template/viewonline_body.html
index 1c8734d06a..b05a9470e0 100644
--- a/phpBB/styles/subsilver2/template/viewonline_body.html
+++ b/phpBB/styles/subsilver2/template/viewonline_body.html
@@ -8,7 +8,7 @@
 	<table width="100%" cellspacing="1">
 	<tr>
 		<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-		<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b></td>
+		<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
 	</tr>
 	</table>
 <!-- ENDIF -->
@@ -39,7 +39,7 @@
 	<table width="100%" cellspacing="1">
 	<tr>
 		<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-		<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b></td>
+		<td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td>
 	</tr>
 	</table>
 <!-- ENDIF -->
-- 
cgit v1.2.1


From ca43a8947a67642f6d1f211f1f5e030b2526ebe2 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 20 Jul 2012 23:53:11 +0200
Subject: [ticket/11008] Remove eval() calls to get document[id]

PHPBB3-11008
---
 phpBB/styles/subsilver2/template/memberlist_search.html | 6 +-----
 phpBB/styles/subsilver2/template/overall_header.html    | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index 96ffad00d6..ab1ecca2ee 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -43,11 +43,7 @@
 		*/
 		function marklist(id, name, state)
 		{
-			var parent = document.getElementById(id);
-			if (!parent)
-			{
-				eval('parent = document.' + id);
-			}
+			var parent = document.getElementById(id) || document[id];
 
 			if (!parent)
 			{
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 5d5489338a..f08531c47f 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -71,11 +71,7 @@ function find_username(url)
 */
 function marklist(id, name, state)
 {
-	var parent = document.getElementById(id);
-	if (!parent)
-	{
-		eval('parent = document.' + id);
-	}
+	var parent = document.getElementById(id) || document[id];
 
 	if (!parent)
 	{
-- 
cgit v1.2.1


From ffe7f76b90bd24c4c2f2c8bf24c34df69f2def52 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 22 Jul 2012 22:58:43 -0500
Subject: [ticket/11021] subsilver2 support

PHPBB3-11021
---
 phpBB/styles/subsilver2/template/breadcrumbs.html    | 2 +-
 phpBB/styles/subsilver2/template/overall_header.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index f8476ec37a..47c316664e 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -1,7 +1,7 @@
 	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;">
 	<tr>
 		<td class="row1">
-			<p class="breadcrumbs"><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
+			<p class="breadcrumbs"><!-- IF U_HOME --><a href="{U_HOME}">{L_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
 			<p class="datetime">{S_TIMEZONE}</p>
 		</td>
 	</tr>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index f08531c47f..ded087ca6d 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -139,7 +139,7 @@ function marklist(id, name, state)
 	<div id="logodesc">
 		<table width="100%" cellspacing="0">
 		<tr>
-			<td><a href="{U_INDEX}" class="imageset">{SITE_LOGO_IMG}</a></td>
+			<td><a href="<!-- IF U_HOME -->{U_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" class="imageset">{SITE_LOGO_IMG}</a></td>
 			<td width="100%" align="center"><h1>{SITENAME}</h1><span class="gen">{SITE_DESCRIPTION}</span></td>
 		</tr>
 		</table>
-- 
cgit v1.2.1


From 22951e43674d023f43edc8da7ade33f01b5428c8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 23 Jul 2012 17:02:40 +0200
Subject: [ticket/11004] Make suggestion button a real button and fix it's
 value

PHPBB3-11004
---
 phpBB/styles/subsilver2/template/timezone_option.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html
index 3f1e14b33d..c7e47a8ee4 100644
--- a/phpBB/styles/subsilver2/template/timezone_option.html
+++ b/phpBB/styles/subsilver2/template/timezone_option.html
@@ -7,7 +7,7 @@
 				<option value="">{L_SELECT_CURRENT_TIME}</option>
 				{S_TZ_DATE_OPTIONS}
 			</select><br />
-			<input id="tz_select_date_suggest" class="btnlite" style="display: none;" data-is-registration="<!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
+			<input type="button" id="tz_select_date_suggest" class="btnlite" style="display: none;" data-is-registration="<!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
 		</div>
 		<!-- ENDIF -->
 		<select name="tz" id="timezone" class="autowidth tz_select">
-- 
cgit v1.2.1


From eeb7b1bac31a623cae3a025c5f0f59a417b3b9b8 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 23 Jul 2012 17:08:40 -0700
Subject: [ticket/11025] Make last topic titles in forum list Bold

This small style tweak will make the truncated last topic titles
shown in the forum list BOLD for better visual impact.

PHPBB3-11025
---
 phpBB/styles/subsilver2/template/forumlist_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index b9a1102df0..95ed94070f 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -61,7 +61,7 @@
 			<td class="row2" align="center" nowrap="nowrap">
 				<!-- IF forumrow.LAST_POST_TIME -->
 					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
-						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
+						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}"><b>{forumrow.LAST_POST_SUBJECT_TRUNCATED}</b></a></p>
 					<!-- ENDIF -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
-- 
cgit v1.2.1


From 8c337a260bf96d3d6f25973029579cc89abe67ae Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 23 Jul 2012 18:33:32 -0700
Subject: [ticket/11025] Replace <b> with <strong> and/or class for semantic
 styling

PHPBB3-11025
---
 phpBB/styles/subsilver2/template/forumlist_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index 95ed94070f..8e3c6b1f79 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -61,7 +61,7 @@
 			<td class="row2" align="center" nowrap="nowrap">
 				<!-- IF forumrow.LAST_POST_TIME -->
 					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
-						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}"><b>{forumrow.LAST_POST_SUBJECT_TRUNCATED}</b></a></p>
+						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}"><strong>{forumrow.LAST_POST_SUBJECT_TRUNCATED}</strong></a></p>
 					<!-- ENDIF -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
-- 
cgit v1.2.1


From 4ff644890a9cf10abca784ffc8dc4b41a61aa79c Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 23 Jul 2012 18:43:28 -0700
Subject: [ticket/11025] Replace <b> with <strong> and/or class for semantic
 styling in subsilver2

PHPBB3-11025
---
 phpBB/styles/subsilver2/template/forumlist_body.html | 2 +-
 phpBB/styles/subsilver2/theme/stylesheet.css         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index 8e3c6b1f79..521eaf3c16 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -61,7 +61,7 @@
 			<td class="row2" align="center" nowrap="nowrap">
 				<!-- IF forumrow.LAST_POST_TIME -->
 					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
-						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}"><strong>{forumrow.LAST_POST_SUBJECT_TRUNCATED}</strong></a></p>
+						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
 					<!-- ENDIF -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 18d15a8d41..4bb9e6f9bf 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -422,6 +422,11 @@ a.topictitle:visited {
 	text-decoration: none;
 }
 
+a.lastsubject {
+	font-weight: bold;
+	text-decoration: none;
+}
+
 th a,
 th a:visited {
 	color: #FFA34F !important;
-- 
cgit v1.2.1


From edec4a492e20d71486574ab94b4141d2f355b6fd Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 23 Jul 2012 18:47:23 -0700
Subject: [ticket/11025] Add underline for hover to classes

PHPBB3-11025
---
 phpBB/styles/subsilver2/theme/stylesheet.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 4bb9e6f9bf..9e258ea778 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -427,6 +427,10 @@ a.lastsubject {
 	text-decoration: none;
 }
 
+a.lastsubject:hover {
+	text-decoration: underline;
+}
+
 th a,
 th a:visited {
 	color: #FFA34F !important;
-- 
cgit v1.2.1


From c83ca457a002be4899390cc8a7b0c2636f69e25d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Aug 2012 17:20:45 +0200
Subject: [ticket/11069] Add closing span back to credit line in subsilver2
 simple footer

Regression from 0ceb77fb995e7433242a87c1fe0c22840a2b23e1.

PHPBB3-11069
---
 phpBB/styles/subsilver2/template/simple_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index db95c7952a..6cb4f401da 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -2,7 +2,7 @@
 </div>
 
 <div id="wrapfooter">
-	<span class="copyright">{CREDIT_LINE}
+	<span class="copyright">{CREDIT_LINE}</span>
 </div>
 
 </body>
-- 
cgit v1.2.1


From 7a4701399412faedd725195f849c18c770a126cb Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 10:44:18 -0500
Subject: [ticket/11021] Use L_SITE_HOME instead of L_HOME

Check site home url against !== '', not empty

PHPBB3-11021
---
 phpBB/styles/subsilver2/template/breadcrumbs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index 47c316664e..95da9aedc7 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -1,7 +1,7 @@
 	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;">
 	<tr>
 		<td class="row1">
-			<p class="breadcrumbs"><!-- IF U_HOME --><a href="{U_HOME}">{L_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
+			<p class="breadcrumbs"><!-- IF U_HOME --><a href="{U_HOME}">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
 			<p class="datetime">{S_TIMEZONE}</p>
 		</td>
 	</tr>
-- 
cgit v1.2.1


From 9e5505933aec5a57e57018e6375be0bf28636fbe Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 11:10:25 -0500
Subject: [ticket/11021] Fix the language changes that were lost previously

Change U_HOME to U_SITE_HOME

PHPBB3-11021
---
 phpBB/styles/subsilver2/template/breadcrumbs.html    | 2 +-
 phpBB/styles/subsilver2/template/overall_header.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index 95da9aedc7..73386ed851 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -1,7 +1,7 @@
 	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;">
 	<tr>
 		<td class="row1">
-			<p class="breadcrumbs"><!-- IF U_HOME --><a href="{U_HOME}">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
+			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
 			<p class="datetime">{S_TIMEZONE}</p>
 		</td>
 	</tr>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index ded087ca6d..8bedec4c9e 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -79,7 +79,7 @@ function marklist(id, name, state)
 	}
 
 	var rb = parent.getElementsByTagName('input');
-	
+
 	for (var r = 0; r < rb.length; r++)
 	{
 		if (rb[r].name.substr(0, name.length) == name)
@@ -139,7 +139,7 @@ function marklist(id, name, state)
 	<div id="logodesc">
 		<table width="100%" cellspacing="0">
 		<tr>
-			<td><a href="<!-- IF U_HOME -->{U_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" class="imageset">{SITE_LOGO_IMG}</a></td>
+			<td><a href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" class="imageset">{SITE_LOGO_IMG}</a></td>
 			<td width="100%" align="center"><h1>{SITENAME}</h1><span class="gen">{SITE_DESCRIPTION}</span></td>
 		</tr>
 		</table>
-- 
cgit v1.2.1


From 95d02d74ac6d71578a98e8850140d9a6cad7e852 Mon Sep 17 00:00:00 2001
From: Vinny <vinny@suportephpbb.com.br>
Date: Fri, 5 Oct 2012 21:18:59 -0300
Subject: [ticket/11135] Full replacement of credit link to https

PHPBB3-11135
---
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 2 +-
 phpBB/styles/subsilver2/template/viewtopic_print.html          | 2 +-
 phpBB/styles/subsilver2/theme/stylesheet.css                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index 24194e4c26..cd55c16a50 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -114,7 +114,7 @@ hr.sep {
 	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
 </tr>
 <tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
+	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />https://www.phpbb.com/</span></td>
 </tr>
 </table>
 
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 964c95f677..1ca1eccc99 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -128,7 +128,7 @@ hr.sep {
 	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
 </tr>
 <tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
+	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />https://www.phpbb.com/</span></td>
 </tr>
 </table>
 
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 444104ae3c..177a988e93 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -3,7 +3,7 @@
 	Style name:			subsilver2
 	Based on style:		subSilver (the default phpBB 2.0.x style)
 	Original author:	Tom Beddard ( http://www.subblue.com/ )
-	Modified by:		phpBB Group ( http://www.phpbb.com/ )
+	Modified by:		phpBB Group ( https://www.phpbb.com/ )
     --------------------------------------------------------------
 */
 
-- 
cgit v1.2.1


From 7675d72622cf47789c83c9a243d17b0db37b72d2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Oct 2012 22:36:37 +0200
Subject: [ticket/11014] Fix text for previous/next links in Subsilver2

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

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/pagination.html b/phpBB/styles/subsilver2/template/pagination.html
index f78bb554fc..a2e023ac22 100644
--- a/phpBB/styles/subsilver2/template/pagination.html
+++ b/phpBB/styles/subsilver2/template/pagination.html
@@ -1,10 +1,10 @@
 <!-- IF .pagination -->
 	<b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> 
 	<!-- BEGIN pagination -->
-		<!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
+		<!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a>
 		<!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong>
 		<!-- ELSEIF pagination.S_IS_ELLIPSIS --> {L_ELLIPSIS} 
-		<!-- ELSEIF pagination.S_IS_NEXT --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
+		<!-- ELSEIF pagination.S_IS_NEXT --><a href="{pagination.PAGE_URL}">{L_NEXT}</a>
 		<!-- ELSE --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
 		<!-- ENDIF -->
 	<!-- END pagination -->
-- 
cgit v1.2.1


From 7ce43d49d8aadeab7db316741cc9d2503fee844c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Oct 2012 22:38:18 +0200
Subject: [ticket/11014] Fix IF statements for new template pagination

PHPBB3-11014
---
 phpBB/styles/subsilver2/template/mcp_footer.html        | 2 +-
 phpBB/styles/subsilver2/template/ucp_groups_manage.html | 2 +-
 phpBB/styles/subsilver2/template/viewonline_body.html   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/mcp_footer.html b/phpBB/styles/subsilver2/template/mcp_footer.html
index b48c244653..280920b148 100644
--- a/phpBB/styles/subsilver2/template/mcp_footer.html
+++ b/phpBB/styles/subsilver2/template/mcp_footer.html
@@ -3,7 +3,7 @@
 		</tr>
 	</table>
 
-	<!-- IF PAGINATION -->
+	<!-- IF .pagination -->
 		<table width="80%" align="{S_CONTENT_FLOW_END}" cellspacing="1">
 		<tr>
 			<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
index ac678895a6..decd40a6de 100644
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -185,7 +185,7 @@
 	</table>
 
 	<div class="pagination" style="float: {S_CONTENT_FLOW_BEGIN};">
-		<!-- IF PAGINATION -->
+		<!-- IF .pagination -->
 			<!-- INCLUDE pagination.html -->
 		<!-- ELSE -->
 			{S_ON_PAGE}
diff --git a/phpBB/styles/subsilver2/template/viewonline_body.html b/phpBB/styles/subsilver2/template/viewonline_body.html
index b05a9470e0..9820124375 100644
--- a/phpBB/styles/subsilver2/template/viewonline_body.html
+++ b/phpBB/styles/subsilver2/template/viewonline_body.html
@@ -4,7 +4,7 @@
 <h4>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> [ <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a> ]<!-- ENDIF --></h4>
 <br />
 
-<!-- IF PAGINATION -->
+<!-- IF .pagination -->
 	<table width="100%" cellspacing="1">
 	<tr>
 		<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
@@ -35,7 +35,7 @@
 <!-- ENDIF -->
 </table>
 
-<!-- IF PAGINATION -->
+<!-- IF .pagination -->
 	<table width="100%" cellspacing="1">
 	<tr>
 		<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
-- 
cgit v1.2.1