Merge pull request #2088 from nickvergessen/ticket/12236

Ticket/12236 Convert AOL and Yahoo to custom profile fields
author: Nathan Guse <nathaniel.guse@gmail.com> 2014-03-05 18:44:39 -0600
committer: Nathan Guse <nathaniel.guse@gmail.com> 2014-03-05 18:44:39 -0600
commit: 4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f (patch)
tree: c7828ddf135f2ad66570554f1369cf70483ddefa /phpBB/styles/subsilver2
parent: 40c582688b7eb4fd5e48d06c4f2fd4c044012b08 (diff)
parent: d380cdec02f2d5a6d6b4756570031af87590905a (diff)
download: forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar
forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.gz
forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.bz2
forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.xz
forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.zip
6 files changed, 26 insertions, 69 deletions
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index 0fcd139ae1..a19229605a 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -12,18 +12,9 @@
 	</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_AIM 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_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
 	</tr>
 
-	<!-- IF S_SEND_AIM -->
-		<tr>
-			<td class="row1" colspan="2" align="center"><br /><a class="gen" href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://www.aim.com/products/express">{L_IM_AIM_EXPRESS}</a> </td>
-		</tr>
-		<tr>
-			<td class="cat" colspan="2" align="center">&nbsp;</td>
-		</tr>
-	<!-- ENDIF -->
-
 	<!-- IF S_SEND_JABBER -->
 		<tr>
 			<td class="row1"><b class="genmed">{L_IM_MESSAGE}{L_COLON} </b></td>
@@ -32,21 +23,16 @@
 		<tr>
 			<td class="cat" colspan="2" align="center"><input class="btnmain" name="submit" type="submit" value="{L_IM_SEND}" /></td>
 		</tr>
-	<!-- ENDIF -->
-
-	<!-- IF S_NO_SEND_JABBER -->
-		<tr>
-			<td class="row1" colspan="2"><span class="genmed">{L_IM_NO_JABBER}</span></td>
-		</tr>
-	<!-- ENDIF -->
-
-	<!-- IF S_SENT_JABBER -->
 		<tr>
 			<td class="row1" colspan="2" align="center"><span class="gen">{L_IM_SENT_JABBER}</span></td>
 		</tr>
 		<tr>
 			<td class="cat" colspan="2" align="center"></td>
 		</tr>
+	<!-- ELSEIF S_NO_SEND_JABBER -->
+		<tr>
+			<td class="row1" colspan="2"><span class="genmed">{L_IM_NO_JABBER}</span></td>
+		</tr>
 	<!-- ENDIF -->
 
 	</table>
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index 251230b643..aa6b61fe22 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -76,55 +76,42 @@
 <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 colspan="2" class="row1">&nbsp;</td>
-</tr>
-<tr>
-<!-- IF S_EMAIL_SEARCH_ALLOWED -->
-	<td class="row1"><b class="genmed">{L_EMAIL}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="email" name="email" value="{EMAIL}" /></td>
-<!-- ELSE -->
-	<td colspan="2" class="row1">&nbsp;</td>
-<!-- ENDIF -->
-	<td class="row1"><b class="genmed">{L_AIM}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="aim" value="{AIM}" /></td>
+	<!-- IF S_EMAIL_SEARCH_ALLOWED -->
+		<td class="row1"><b class="genmed">{L_EMAIL}{L_COLON}</b></td>
+		<td class="row2"><input class="post" type="email" name="email" value="{EMAIL}" /></td>
+	<!-- ELSE -->
+		<td colspan="2" class="row1">&nbsp;</td>
+	<!-- ENDIF -->
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_JOINED}{L_COLON}</b></td>
 	<td class="row2"><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="post" type="text" name="joined" value="{JOINED}" /></td>
-	<td class="row1"><b class="genmed">{L_YIM}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="yahoo" value="{YAHOO}" /></td>
+	<td class="row1"><b class="genmed">{L_POSTS}{L_COLON}</b></td>
+	<td class="row2"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="number" min="0" name="count" value="{COUNT}" /></td>
 </tr>
 <!-- IF S_VIEWONLINE -->
 <tr>
 	<td class="row1"><b class="genmed">{L_LAST_ACTIVE}{L_COLON}</b></td>
 	<td class="row2"><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="post" type="text" name="active" value="{ACTIVE}" /></td>
-	<td colspan="2" class="row1">&nbsp;</td>
+	<!-- IF S_IP_SEARCH_ALLOWED -->
+		<td class="row1"><b class="genmed">{L_POST_IP}{L_COLON}</b></td>
+		<td class="row2"><input class="post" type="text" name="ip" value="{IP}" /></td>
+	<!-- ELSE -->
+		<td colspan="2" class="row1">&nbsp;</td>
+	<!-- ENDIF -->
 </tr>
 <!-- ENDIF -->
 <tr>
-	<td class="row1"><b class="genmed">{L_POSTS}{L_COLON}</b></td>
-	<td class="row2"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="number" min="0" name="count" value="{COUNT}" /></td>
+	<td class="row1"><b class="genmed">{L_GROUP}{L_COLON}</b></td>
+	<td class="row2" nowrap="nowrap"><select name="search_group_id">{S_GROUP_SELECT}</select></td>
 	<td class="row1"><b class="genmed">{L_JABBER}{L_COLON}</b></td>
 	<td class="row2"><input class="post" type="text" name="jabber" value="{JABBER}" /></td>
 </tr>
 <tr>
 	<td class="row1"><b class="genmed">{L_SORT_BY}{L_COLON}</b></td>
 	<td class="row2" nowrap="nowrap"><select name="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select>&nbsp;</td>
-<!-- IF S_IP_SEARCH_ALLOWED -->
-	<td class="row1"><b class="genmed">{L_POST_IP}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="ip" value="{IP}" /></td>
-</tr>
-<tr>
-	<td class="row1"><b class="genmed">{L_GROUP}{L_COLON}</b></td>
-	<td class="row2" nowrap="nowrap"><select name="search_group_id">{S_GROUP_SELECT}</select></td>
-	<td class="row1">&nbsp;</td>
-	<td class="row2">&nbsp;</td>
-</tr>
-<!-- ELSE -->
-	<td class="row1"><b class="genmed">{L_GROUP}{L_COLON}</b></td>
-	<td class="row2" nowrap="nowrap"><select name="search_group_id">{S_GROUP_SELECT}</select></td>
+	<td colspan="2" class="row1">&nbsp;</td>
 </tr>
-<!-- ENDIF -->
 <tr>
 	<td class="cat" colspan="4" align="center"><input class="btnmain" type="submit" name="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
 </tr>
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 9c84fedd89..28f4da4fef 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -119,14 +119,6 @@
 				</tr>
 			<!-- ENDIF -->
 			<tr>
-				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_YIM}{L_COLON} </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}{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_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>
 			</tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
index 877c9fe1ab..bf0aa8f899 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
@@ -13,14 +13,6 @@
 	<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_AIM}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="text" name="aim" size="30" maxlength="255" value="{AIM}" /></td>
-</tr>
-<tr>
-	<td class="row1" width="35%"><b class="genmed">{L_UCP_YIM}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="email" name="yim" size="30" maxlength="255" value="{YIM}" /></td>
-</tr>
-<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_JABBER}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="text" name="jabber" size="30" maxlength="255" value="{JABBER}" /></td>
 </tr>
diff --git a/phpBB/styles/subsilver2/theme/en/stylesheet.css b/phpBB/styles/subsilver2/theme/en/stylesheet.css
index 449fe7bec5..57f9fce26d 100644
--- a/phpBB/styles/subsilver2/theme/en/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/en/stylesheet.css
@@ -1,5 +1,5 @@
 /* EN Language Pack */
-.imageset.icon_contact_aim {
+.imageset.phpbb_aol-icon, .imageset.icon_contact_aim {
 	background-image: url("./icon_contact_aim.gif");
 	padding-left: 72px;
 	padding-top: 20px;
@@ -29,7 +29,7 @@
 	padding-left: 72px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_yahoo {
+.imageset.phpbb_yahoo-icon, .imageset.icon_contact_yahoo {
 	background-image: url("./icon_contact_yahoo.gif");
 	padding-left: 72px;
 	padding-top: 20px;
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 936625a0cf..11fc91af0c 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1013,7 +1013,7 @@ a.imageset {
 
 
 /* English images for fallback */
-.imageset.icon_contact_aim {
+.imageset.phpbb_aol-icon, .imageset.icon_contact_aim {
 	background-image: url("./en/icon_contact_aim.gif");
 	padding-left: 72px;
 	padding-top: 20px;
@@ -1043,7 +1043,7 @@ a.imageset {
 	padding-left: 72px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_yahoo {
+.imageset.phpbb_yahoo-icon, .imageset.icon_contact_yahoo {
 	background-image: url("./en/icon_contact_yahoo.gif");
 	padding-left: 72px;
 	padding-top: 20px;
author	Nathan Guse <nathaniel.guse@gmail.com>	2014-03-05 18:44:39 -0600
committer	Nathan Guse <nathaniel.guse@gmail.com>	2014-03-05 18:44:39 -0600
commit	4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f (patch)
tree	c7828ddf135f2ad66570554f1369cf70483ddefa /phpBB/styles/subsilver2
parent	40c582688b7eb4fd5e48d06c4f2fd4c044012b08 (diff)
parent	d380cdec02f2d5a6d6b4756570031af87590905a (diff)
download	forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.gz forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.bz2 forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.tar.xz forums-4b6f3f8b0fc3fc3b0d7fa0147930d0ea02107a8f.zip