From 76409388afcd6389b5a29bc54b49faaf6bc4b4a5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Feb 2014 15:11:17 +0100
Subject: [ticket/12234] Replace ICQ with custom profile field

PHPBB3-12234
---
 phpBB/styles/subsilver2/template/memberlist_im.html            | 2 +-
 phpBB/styles/subsilver2/template/memberlist_search.html        | 3 +--
 phpBB/styles/subsilver2/template/memberlist_view.html          | 4 ----
 phpBB/styles/subsilver2/template/ucp_profile_profile_info.html | 4 ----
 phpBB/styles/subsilver2/theme/en/stylesheet.css                | 2 +-
 phpBB/styles/subsilver2/theme/stylesheet.css                   | 2 +-
 6 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'phpBB/styles/subsilver2')

diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index da1ad661c3..35b1e6bdcb 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -14,7 +14,7 @@
 	</tr>
 	<tr>
 		<td class="row1"><b class="genmed">{L_IM_RECIPIENT}{L_COLON} </b></td>
-		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
+		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
 	</tr>
 
 	<!-- IF S_SEND_AIM -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index 484bbd85e8..a0d46bf670 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -76,8 +76,7 @@
 <tr>
 	<td class="row1"><b class="genmed">{L_USERNAME}{L_COLON}</b></td>
 	<td class="row2"><input class="post" type="text" name="username" value="{USERNAME}" /></td>
-	<td class="row1"><b class="genmed">{L_ICQ}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="icq" value="{ICQ}" /></td>
+	<td colspan="2" class="row1">&nbsp;</td>
 </tr>
 <tr>
 <!-- IF S_EMAIL_SEARCH_ALLOWED -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 052c4ac0e3..4a81482c18 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -130,10 +130,6 @@
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_AIM}{L_COLON} </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}{L_COLON} </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}{L_COLON} </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>
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
index a565cac5ce..6f91d8029b 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
@@ -12,10 +12,6 @@
 <tr>
 	<td class="row1" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
 </tr>
-<tr>
-	<td class="row1" width="35%"><b class="genmed">{L_UCP_ICQ}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="text" name="icq" size="30" maxlength="15" value="{ICQ}" /></td>
-</tr>
 <tr>
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_AIM}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="text" name="aim" size="30" maxlength="255" value="{AIM}" /></td>
diff --git a/phpBB/styles/subsilver2/theme/en/stylesheet.css b/phpBB/styles/subsilver2/theme/en/stylesheet.css
index 563492d4fc..06332f082a 100644
--- a/phpBB/styles/subsilver2/theme/en/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/en/stylesheet.css
@@ -9,7 +9,7 @@
 	padding-left: 72px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_icq {
+.imageset.phpbb_icq-icon, .imageset.icon_contact_icq {
 	background-image: url("./icon_contact_icq.gif");
 	padding-left: 72px;
 	padding-top: 20px;
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index da99051329..9deccd4420 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1023,7 +1023,7 @@ a.imageset {
 	padding-left: 72px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_icq {
+.imageset.phpbb_icq-icon, .imageset.icon_contact_icq {
 	background-image: url("./en/icon_contact_icq.gif");
 	padding-left: 72px;
 	padding-top: 20px;
-- 
cgit v1.2.1