4 files changed, 64 insertions, 47 deletions
diff --git a/phpBB/styles/prosilver/imageset/en/imageset.cfg b/phpBB/styles/prosilver/imageset/en/imageset.cfg
new file mode 100644
index 0000000000..84029aa3b1
--- /dev/null
+++ b/phpBB/styles/prosilver/imageset/en/imageset.cfg
@@ -0,0 +1,35 @@
+#
+# phpBB Imageset Configuration File
+#
+# @package phpBB3
+# @copyright (c) 2006 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_pm = icon_contact_pm.gif*40*28
+
+img_icon_post_edit = icon_post_edit.gif*40*42
+img_icon_post_quote = icon_post_quote.gif*40*54
+
+img_icon_user_online = icon_user_online.gif
+img_icon_user_offline = icon_user_offline.gif
+img_icon_user_search = icon_user_search.gif
+
+img_button_pm_forward = button_pm_forward.gif
+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/prosilver/imageset/imageset.cfg b/phpBB/styles/prosilver/imageset/imageset.cfg
index 0e0a85f5ce..08d974d582 100644
--- a/phpBB/styles/prosilver/imageset/imageset.cfg
+++ b/phpBB/styles/prosilver/imageset/imageset.cfg
@@ -91,14 +91,14 @@ img_icon_contact_email = icon_contact_email.gif*20*72
 img_icon_contact_icq = icon_contact_icq.gif*20*72
 img_icon_contact_jabber = icon_contact_jabber.gif*20*72
 img_icon_contact_msnm = icon_contact_msnm.gif*20*72
-img_icon_contact_pm = {LANG}/icon_contact_pm.gif
+
 img_icon_contact_www = icon_contact_www.gif*20*72
 img_icon_contact_yahoo = icon_contact_yahoo.gif*20*72
 
 img_icon_post_delete = icon_post_delete.gif*20*20
-img_icon_post_edit = {LANG}/icon_post_edit.gif
+
 img_icon_post_info = icon_post_info.gif*20*20
-img_icon_post_quote = {LANG}/icon_post_quote.gif
+
 img_icon_post_report = icon_post_report.gif*20*20
 img_icon_post_target = icon_post_target.gif*9*12
 img_icon_post_target_unread = icon_post_target_unread.gif*9*12
@@ -109,15 +109,8 @@ img_icon_topic_newest = icon_topic_newest.gif*9*12
 img_icon_topic_reported = icon_topic_reported.gif*14*16
 img_icon_topic_unapproved = icon_topic_unapproved.gif*14*16
 
-img_icon_user_online = {LANG}/icon_user_online.gif
-img_icon_user_offline = {LANG}/icon_user_offline.gif
+
+
 img_icon_user_profile = icon_user_profile.gif*11*11
-img_icon_user_search = {LANG}/icon_user_search.gif
-img_icon_user_warn = icon_post_report.gif*20*20
 
-img_button_pm_forward = {LANG}/button_pm_forward.gif
-img_button_pm_new = {LANG}/button_pm_new.gif
-img_button_pm_reply = {LANG}/button_pm_reply
-img_button_topic_locked = {LANG}/button_topic_locked.gif
-img_button_topic_new = {LANG}/button_topic_new.gif
-img_button_topic_reply = {LANG}/button_topic_reply.gif
+img_icon_user_warn = icon_post_report.gif*20*20
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 26d47ce745..d135625c4d 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -150,11 +150,11 @@ ul.profile-icons li a:hover { background: none; }
 .quote-icon, .quote-icon a			{ background: none top left no-repeat; }
 
 ul.profile-icons li.pm-icon {
-	width: 28px;
+	width: {IMG_ICON_CONTACT_PM_WIDTH}px;
 }
 
 ul.profile-icons li.quote-icon {
-	width: 54px;
+	width: {IMG_ICON_POST_QUOTE_WIDTH}px;
 	margin-left: 10px;
 }
 
@@ -173,7 +173,7 @@ div.rank-image {
 .edit-icon, .edit-icon a			{ background: none top left no-repeat; }
 
 ul.profile-icons li.edit-icon {
-	width: 41px;
+	width: {IMG_ICON_POST_EDIT_WIDTH}px;
 }
 
 .delete-icon, .delete-icon a		{ background: none top left no-repeat; }
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 37ca60320a..d2d3f22bdb 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -598,12 +598,12 @@ Colours and backgrounds for buttons.css
 -------------------------------------------------------------- */
 
 /* Big button images */
-.reply-icon, .reply-icon a				{ background-image: url("{T_IMAGESET_LANG_PATH}/button_topic_reply.gif"); }
-.post-icon, .post-icon a				{ background-image: url("{T_IMAGESET_LANG_PATH}/button_topic_new.gif") ;}
-.locked-icon, .locked-icon a			{ background-image: url("{T_IMAGESET_LANG_PATH}/button_topic_locked.gif"); }
-.pmreply-icon, .pmreply-icon a		{ background-image: url("{T_IMAGESET_LANG_PATH}/button_pm_reply.gif") ;}
-.newpm-icon, .newpm-icon a			{ background-image: url("{T_IMAGESET_LANG_PATH}/button_pm_new.gif") ;}
-.forwardpm-icon, .forwardpm-icon a 	{ background-image: url("{T_IMAGESET_LANG_PATH}/button_pm_forward.gif") ;}
+.reply-icon, .reply-icon a				{ background-image: url("{IMG_BUTTON_TOPIC_REPLY_SRC}"); }
+.post-icon, .post-icon a				{ background-image: url("{IMG_BUTTON_TOPIC_NEW_SRC}") ;}
+.locked-icon, .locked-icon a			{ background-image: url("{IMG_BUTTON_TOPIC_LOCKED_SRC}"); }
+.pmreply-icon, .pmreply-icon a		{ background-image: url("{IMG_BUTTON_PM_REPLY_SRC}") ;}
+.newpm-icon, .newpm-icon a			{ background-image: url("{IMG_BUTTON_PM_NEW_SRC}") ;}
+.forwardpm-icon, .forwardpm-icon a 	{ background-image: url("{IMG_BUTTON_PM_FORWARD_SRC}") ;}
 
 a.print {
 	background-image: url("{T_THEME_PATH}/images/icon_print.gif");
@@ -634,34 +634,23 @@ a.fontsize {
 .icon-search						{ background-image: url("{T_THEME_PATH}/images/icon_search.gif"); }
 
 /* Profile & navigation icons */
-.email-icon, .email-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_contact_email.gif"); }
-.aim-icon, .aim-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_contact_aim.gif"); }
-.yahoo-icon, .yahoo-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_contact_yahoo.gif"); }
-.web-icon, .web-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_contact_www.gif"); }
-.msnm-icon, .msnm-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_contact_msnm.gif"); }
-.icq-icon, .icq-icon a				{ background-image: url("{T_IMAGESET_PATH}/icon_contact_icq.gif"); }
-.pm-icon, .pm-icon a				{ background-image: url("{T_IMAGESET_LANG_PATH}/icon_contact_pm.gif"); }
-.jabber-icon, .jabber-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_contact_jabber.gif"); }
-.quote-icon, .quote-icon a			{ background-image: url("{T_IMAGESET_LANG_PATH}/icon_post_quote.gif"); }
-
-/* Profile & navigation icons */
-.email-icon, .email-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_contact_email.gif"); }
-.aim-icon, .aim-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_contact_aim.gif"); }
-.yahoo-icon, .yahoo-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_contact_yahoo.gif"); }
-.web-icon, .web-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_contact_www.gif"); }
-.msnm-icon, .msnm-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_contact_msnm.gif"); }
-.icq-icon, .icq-icon a				{ background-image: url("{T_IMAGESET_PATH}/icon_contact_icq.gif"); }
-.pm-icon, .pm-icon a				{ background-image: url("{T_IMAGESET_LANG_PATH}/icon_contact_pm.gif"); }
-.jabber-icon, .jabber-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_contact_jabber.gif"); }
-.quote-icon, .quote-icon a			{ background-image: url("{T_IMAGESET_LANG_PATH}/icon_post_quote.gif"); }
+.email-icon, .email-icon a			{ background-image: url("{IMG_ICON_CONTACT_EMAIL_SRC}"); }
+.aim-icon, .aim-icon a			{ background-image: url("{IMG_ICON_CONTACT_AIM_SRC}"); }
+.yahoo-icon, .yahoo-icon a		{ background-image: url("{IMG_ICON_CONTACT_YAHOO_SRC}"); }
+.web-icon, .web-icon a			{ background-image: url("{IMG_ICON_CONTACT_WWW_SRC}"); }
+.msnm-icon, .msnm-icon a		{ background-image: url("{IMG_ICON_CONTACT_MSNM_SRC}"); }
+.icq-icon, .icq-icon a				{ background-image: url("{IMG_ICON_CONTACT_ICQ_SRC}"); }
+.pm-icon, .pm-icon a				{ background-image: url("{IMG_ICON_CONTACT_PM_SRC}"); }
+.jabber-icon, .jabber-icon a		{ background-image: url("{IMG_ICON_CONTACT_JABBER_SRC}"); }
+.quote-icon, .quote-icon a			{ background-image: url("{IMG_ICON_POST_QUOTE_SRC}"); }
 
 /* Moderator icons */
-.report-icon, .report-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_post_report.gif"); }
-.warn-icon, .warn-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_post_report.gif"); }
-.edit-icon, .edit-icon a			{ background-image: url("{T_IMAGESET_LANG_PATH}/icon_post_edit.gif"); }
+.report-icon, .report-icon a		{ background-image: url("{IMG_ICON_POST_REPORT_SRC}"); }
+.warn-icon, .warn-icon a			{ background-image: url("{IMG_ICON_POST_REPORT_SRC}"); }
+.edit-icon, .edit-icon a			{ background-image: url("{IMG_ICON_POST_EDIT_SRC}"); }
 
-.delete-icon, .delete-icon a		{ background-image: url("{T_IMAGESET_PATH}/icon_post_delete.gif"); }
-.info-icon, .info-icon a			{ background-image: url("{T_IMAGESET_PATH}/icon_post_info.gif"); }
+.delete-icon, .delete-icon a		{ background-image: url("{IMG_ICON_POST_DELETE_SRC}"); }
+.info-icon, .info-icon a			{ background-image: url("{IMG_ICON_POST_INFO_SRC}"); }
 
 /*  	
 --------------------------------------------------------------