Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop

* github-nickvergessen/ticket/12235: [ticket/12235] Convert WLM to custom profile field [ticket/12187] Do not make clickable when using as contact field [ticket/12187] Split generate_profile_fields_template() into 2 methods [ticket/12187] Remove user_website field [ticket/12187] Remove user_website functionality [ticket/12187] Convert website field data to custom profile field [ticket/12187] Add URL type for profile fields [ticket/12234] Replace ICQ with custom profile field [ticket/12233] Update schema file [ticket/12233] Add images back to subsilver2 [ticket/12233] Allow profile fields to be contact fields Conflicts: phpBB/adm/style/acp_prune_users.html
author: Nils Adermann <naderman@naderman.de> 2014-03-05 11:49:11 +0100
committer: Nils Adermann <naderman@naderman.de> 2014-03-05 11:49:11 +0100
commit: 0e35a8515598b6cdf38c2b98ecde9e8cc984e594 (patch)
tree: c1250a6fc14fcd1eb7b539a3df8d66790d0bc460 /phpBB/styles/prosilver
parent: 4e144005f0ecca45601f2a90b066144f75c6f165 (diff)
parent: 83a7e632b9b21fed88a3dbea679580d0740664f7 (diff)
download: forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar
forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.gz
forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.bz2
forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.xz
forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.zip
13 files changed, 64 insertions, 142 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 495df2871d..408c9b9b8c 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -306,64 +306,6 @@ function apply_onkeypress_event() {
 jQuery(document).ready(apply_onkeypress_event);
 
 /**
-* Run MSN action
-*/
-function msn_action(action, address)
-{
-	// Does the browser support the MSNM object?
-	var app = document.getElementById('objMessengerApp');
-
-	if (!app || !app.MyStatus) {
-		var lang = $('form[data-lang-im-msnm-browser]');
-		if (lang.length) {
-			alert(lang.attr('data-lang-im-msnm-browser'));
-		}
-		return false;
-	}
-
-	// Is MSNM connected?
-	if (app.MyStatus == 1) {
-		var lang = $('form[data-lang-im-msnm-connect]');
-		if (lang.length) {
-			alert(lang.attr('data-lang-im-msnm-connect'));
-		}
-		return false;
-	}
-
-	// Do stuff
-	try {
-		switch (action) {
-			case 'add':
-				app.AddContact(0, address);
-				break;
-
-			case 'im':
-				app.InstantMessage(address);
-				break;
-		}
-	}
-	catch (e) {
-		return;
-	}
-}
-
-/**
-* Add to your contact list
-*/
-function add_contact(address) 
-{
-	msn_action('add', address);
-}
-
-/**
-* Write IM to contact
-*/
-function im_contact(address)
-{
-	msn_action('im', address);
-}
-
-/**
 * Functions for user search popup
 */
 function insert_user(formId, value)
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index c155d431fa..511c7b22c0 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -60,10 +60,7 @@
 		<tr>
 			<th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}<!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF -->"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th>
 			<th class="posts"><a href="{U_SORT_POSTS}#memberlist">{L_POSTS}</a></th>
-			<th class="info">
-				<a href="{U_SORT_WEBSITE}#memberlist">{L_WEBSITE}</a>
-				<!-- BEGIN custom_fields -->{L_COMMA_SEPARATOR} {custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields -->
-			</th>
+			<th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th>
 			<th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th>
 			<!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF -->
 		</tr>
@@ -94,10 +91,7 @@
 	<!-- IF not S_LEADERS_SET -->
 		<th class="name" data-dfn="{L_RANK}{L_COMMA_SEPARATOR}{L_USERNAME}"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP -->{L_GROUP_MEMBERS}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th>
 			<th class="posts"><a href="{U_SORT_POSTS}#memberlist">{L_POSTS}</a></th>
-			<th class="info">
-				<a href="{U_SORT_WEBSITE}#memberlist">{L_WEBSITE}</a>
-				<!-- BEGIN custom_fields -->{L_COMMA_SEPARATOR} {custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields -->
-			</th>
+			<th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th>
 			<th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th>
 			<!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF -->
 	<!-- ELSEIF S_SHOW_GROUP -->
@@ -117,14 +111,7 @@
 	<tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
 		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF --><!-- EVENT memberlist_body_username_prepend -->{memberrow.USERNAME_FULL}<!-- EVENT memberlist_body_username_append --><!-- IF S_IN_SEARCH_POPUP --><br />[&nbsp;<a href="#" onclick="insert_single_user('#results', '{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
 		<td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td>
-		<td class="info">
-			<!-- IF memberrow.U_WWW or .memberrow.custom_fields -->
-				<!-- IF memberrow.U_WWW --><div><a href="{memberrow.U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {memberrow.U_WWW}">{memberrow.U_SHORT_WWW}</a></div><!-- ENDIF -->
-				<!-- BEGIN custom_fields --><div>{memberrow.custom_fields.PROFILE_FIELD_VALUE}</div><!-- END custom_fields -->
-			<!-- ELSE -->
-				&nbsp;
-			<!-- ENDIF -->
-		</td>
+		<td class="info"><!-- BEGIN custom_fields --><div>{memberrow.custom_fields.PROFILE_FIELD_VALUE}</div><!-- BEGINELSE -->&nbsp;<!-- END custom_fields --></td>
 		<td>{memberrow.JOINED}</td>
 		<!-- IF S_VIEWONLINE --><td>{memberrow.VISITED}&nbsp;</td><!-- ENDIF -->
 	</tr>
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index 8e7842e631..9c63a6c35c 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -1,9 +1,8 @@
 <!-- INCLUDE simple_header.html -->
 
-<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger -->
 <h2 class="solo">{L_SEND_IM}</h2>
 
-<form method="post" action="{S_IM_ACTION}" data-lang-im-msnm-connect="{L_IM_MSNM_CONNECT|e('html_attr')}" data-lang-im-msnm-browser="{L_IM_MSNM_BROWSER|e('html_attr')}">
+<form method="post" action="{S_IM_ACTION}">
 
 <div class="panel bg2">
 	<div class="inner">
@@ -13,27 +12,9 @@
 	<fieldset>
 	<dl class="fields2">
 		<dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt>
-		<dd><strong>{USERNAME}</strong><!-- IF S_SEND_ICQ or S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
+		<dd><strong>{USERNAME}</strong><!-- IF S_SEND_AIM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --><!-- IF PRESENCE_IMG --> {PRESENCE_IMG}<!-- ENDIF --></dd>
 	</dl>
 
-	<!-- IF S_SEND_ICQ -->
-		<dl class="fields2">
-			<dt><label for="from">{L_IM_NAME}{L_COLON}</label></dt>
-			<dd><input class="inputbox autowidth" type="text" name="from" id="from" size="20" /></dd>
-		</dl>
-		<dl class="fields2">
-			<dt><label for="body">{L_IM_MESSAGE}{L_COLON}</label></dt>
-			<dd><textarea class="inputbox autowidth" name="body" id="body" rows="5" cols="45"></textarea></dd>
-		</dl>
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
-		</dl>
-		<input type="hidden" name="fromemail" value="{EMAIL}" />
-		<input type="hidden" name="subject" value="{SITENAME}" />
-		<input type="hidden" name="to" value="{IM_CONTACT}" />
-	<!-- ENDIF -->
-
 	<!-- IF S_SEND_AIM -->
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
@@ -43,15 +24,6 @@
 		</dl>
 	<!-- ENDIF -->
 
-	<!-- IF S_SEND_MSNM -->
-		<dl class="fields2">
-			<dt>&nbsp;</dt>
-			<dd><object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object></dd>
-			<dd><a href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a></dd>
-			<dd><a href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a></dd>
-		</dl>
-	<!-- ENDIF -->
-
 	<!-- IF S_SEND_JABBER -->
 		<dl class="fields2">
 			<dt><label for="message">{L_IM_MESSAGE}{L_COLON}</label></dt>
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 0b04d0087c..b07eab04c1 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -18,10 +18,6 @@
 	</dl>
 <!-- ENDIF -->
 	<dl>
-		<dt><label for="icq">{L_ICQ}{L_COLON}</label></dt>
-		<dd><input type="text" name="icq" id="icq" value="{ICQ}" class="inputbox" /></dd>
-	</dl>
-	<dl>
 		<dt><label for="aim">{L_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" name="aim" id="aim" value="{AIM}" class="inputbox" /></dd>
 	</dl>
@@ -30,10 +26,6 @@
 		<dd><input type="text" name="yahoo" id="yahoo" value="{YAHOO}" class="inputbox" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="msn">{L_MSNM}{L_COLON}</label></dt>
-		<dd><input type="text" name="msn" id="msn" value="{MSNM}" class="inputbox" /></dd>
-	</dl>
-	<dl>
 		<dt><label for="jabber">{L_JABBER}:</label></dt>
 		<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd>
 	</dl>
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 1c4b6be2d1..3b9eea347d 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -29,7 +29,11 @@
 		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
 		<!-- IF AGE !== '' --><dt>{L_AGE}{L_COLON}</dt> <dd>{AGE}</dd><!-- ENDIF -->
 		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}{L_COLON}</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF -->
-		<!-- BEGIN custom_fields --><dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields -->
+		<!-- BEGIN custom_fields -->
+			<!-- IF not custom_fields.S_PROFILE_CONTACT -->
+				<dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd>
+			<!-- ENDIF -->
+		<!-- END custom_fields -->
 		<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->
 			<!-- IF U_REMOVE_FRIEND -->
 				<dt>&nbsp;</dt> <dd class="zebra"><a href="{U_REMOVE_FRIEND}" data-ajax="zebra"><strong>{L_REMOVE_FRIEND}</strong></a></dd>
@@ -57,13 +61,20 @@
 
 		<dl class="details">
 		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF -->
-		<!-- IF U_WWW --><dt>{L_WEBSITE}{L_COLON}</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {U_WWW}">{U_WWW}</a></dd><!-- ENDIF -->
 		<!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF -->
-		<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}{L_COLON}</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}{L_COLON}</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}{L_COLON}</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF -->
-		<!-- IF U_ICQ or USER_ICQ --><dt>{L_ICQ}{L_COLON}</dt> <dd><!-- IF U_ICQ --><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_ICQ_MESSAGE}</a><!-- ELSE -->{USER_ICQ}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}{L_COLON}</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}{L_COLON}</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->
+		<!-- BEGIN custom_fields -->
+			<!-- IF custom_fields.S_PROFILE_CONTACT -->
+				<dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt>
+				<!-- IF custom_fields.PROFILE_FIELD_CONTACT -->
+					<dd><a href="{custom_fields.PROFILE_FIELD_CONTACT}">{custom_fields.PROFILE_FIELD_DESC}</a></dd>
+				<!-- ELSE -->
+					<dd>{custom_fields.PROFILE_FIELD_VALUE}</dd>
+				<!-- ENDIF -->
+			<!-- ENDIF -->
+		<!-- END custom_fields -->
 		<!-- IF S_PROFILE_FIELD1 -->
 			<!-- NOTE: Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
 			<dt>{PROFILE_FIELD1_NAME}{L_COLON}</dt> <dd>{PROFILE_FIELD1_VALUE}</dd>
diff --git a/phpBB/styles/prosilver/template/profilefields/url.html b/phpBB/styles/prosilver/template/profilefields/url.html
new file mode 100644
index 0000000000..8dd3a90de1
--- /dev/null
+++ b/phpBB/styles/prosilver/template/profilefields/url.html
@@ -0,0 +1,3 @@
+<!-- BEGIN url -->
+<input type="url" class="inputbox autowidth" name="{url.FIELD_IDENT}" id="{url.FIELD_IDENT}" size="{url.FIELD_LENGTH}" maxlength="{url.FIELD_MAXLEN}" value="{url.FIELD_VALUE}" />
+<!-- END url -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 3623489ccf..f895af90bd 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -27,22 +27,32 @@
 
 		<!-- EVENT ucp_pm_viewmessage_custom_fields_before -->
 		<!-- BEGIN custom_fields -->
-			<dd><strong>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {custom_fields.PROFILE_FIELD_VALUE}</dd>
+			<!-- IF not custom_fields.S_PROFILE_CONTACT -->
+				<dd><strong>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {custom_fields.PROFILE_FIELD_VALUE}</dd>
+			<!-- ENDIF -->
 		<!-- END custom_fields -->
 		<!-- EVENT ucp_pm_viewmessage_custom_fields_after -->
 
 
-		<!-- IF U_PM or U_EMAIL or U_WWW or U_MSN or U_ICQ or U_YIM or U_AIM or U_JABBER -->
+		<!-- IF U_PM or U_EMAIL or U_YIM or U_AIM or U_JABBER -->
 		<dd>
 			<ul class="profile-icons">
+			<!-- EVENT ucp_pm_viewmessage_contact_fields_before -->
 			<!-- IF U_PM --><li class="pm-icon"><a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
 			<!-- IF U_EMAIL --><li class="email-icon"><a href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}"><span>{L_SEND_EMAIL_USER} {MESSAGE_AUTHOR}</span></a></li><!-- ENDIF -->
-			<!-- IF U_WWW --><li class="web-icon"><a href="{U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
-			<!-- IF U_MSN --><li class="msnm-icon"><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_ICQ --><li class="icq-icon"><a href="{U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
 			<!-- IF U_YIM --><li class="yahoo-icon"><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
 			<!-- IF U_AIM --><li class="aim-icon"><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
 			<!-- IF U_JABBER --><li class="jabber-icon"><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
+			<!-- BEGIN custom_fields -->
+				<!-- IF custom_fields.S_PROFILE_CONTACT -->
+					<li class="{custom_fields.PROFILE_FIELD_IDENT}-icon">
+						<a href="<!-- IF custom_fields.PROFILE_FIELD_CONTACT -->{custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{U_MESSAGE_AUTHOR}<!-- ENDIF -->">
+							<span>{custom_fields.PROFILE_FIELD_NAME}</span>
+						</a>
+					</li>
+				<!-- ENDIF -->
+			<!-- END custom_fields -->
+			<!-- EVENT ucp_pm_viewmessage_contact_fields_after -->
 			</ul>
 		</dd>
 		<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
index 03b8aa0a14..fced53cfa0 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
@@ -11,18 +11,10 @@
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 	<dl>
-		<dt><label for="icq">{L_UCP_ICQ}{L_COLON}</label></dt>
-		<dd><input type="text" name="icq" id="icq" maxlength="15" value="{ICQ}" class="inputbox" /></dd>
-	</dl>
-	<dl>
 		<dt><label for="aim">{L_UCP_AIM}{L_COLON}</label></dt>
 		<dd><input type="text" name="aim" id="aim" maxlength="255" value="{AIM}" class="inputbox" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="msn">{L_UCP_MSNM}{L_COLON}</label></dt>
-		<dd><input type="email" name="msn" id="msn" maxlength="255" value="{MSN}" class="inputbox" /></dd>
-	</dl>
-	<dl>
 		<dt><label for="yim">{L_UCP_YIM}{L_COLON}</label></dt>
 		<dd><input type="text" name="yim" id="yim" maxlength="255" value="{YIM}" class="inputbox" /></dd>
 	</dl>
@@ -30,10 +22,6 @@
 		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
 		<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd>
 	</dl>
-	<dl>
-		<dt><label for="website">{L_WEBSITE}{L_COLON}</label></dt>
-		<dd><input type="url" name="website" id="website" maxlength="255" value="{WEBSITE}" class="inputbox" /></dd>
-	</dl>
 	<!-- IF S_BIRTHDAYS_ENABLED -->
 		<dl>
 			<dt><label for="bday_day">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index d5c45e1dfe..a09d044bc1 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -137,22 +137,30 @@
 
 		<!-- EVENT viewtopic_body_postrow_custom_fields_before -->
 		<!-- BEGIN custom_fields -->
-			<dd><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd>
+			<!-- IF not postrow.custom_fields.S_PROFILE_CONTACT -->
+				<dd><strong>{postrow.custom_fields.PROFILE_FIELD_NAME}{L_COLON}</strong> {postrow.custom_fields.PROFILE_FIELD_VALUE}</dd>
+			<!-- ENDIF -->
 		<!-- END custom_fields -->
 		<!-- EVENT viewtopic_body_postrow_custom_fields_after -->
 
 		<!-- IF not S_IS_BOT -->
-		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_WWW or postrow.U_MSN or postrow.U_ICQ or postrow.U_YIM or postrow.U_AIM or postrow.U_JABBER -->
+		<!-- IF postrow.U_PM or postrow.U_EMAIL or postrow.U_YIM or postrow.U_AIM or postrow.U_JABBER -->
 			<dd>
 				<ul class="profile-icons">
 					<!-- IF postrow.U_PM --><li class="pm-icon"><a href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span>{L_PRIVATE_MESSAGE}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_EMAIL --><li class="email-icon"><a href="{postrow.U_EMAIL}" title="{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}"><span>{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_WWW --><li class="web-icon"><a href="{postrow.U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {postrow.U_WWW}"><span>{L_WEBSITE}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_MSN --><li class="msnm-icon"><a href="{postrow.U_MSN}" onclick="popup(this.href, 550, 320); return false;" title="{L_MSNM}"><span>{L_MSNM}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_ICQ --><li class="icq-icon"><a href="{postrow.U_ICQ}" onclick="popup(this.href, 550, 320); return false;" title="{L_ICQ}"><span>{L_ICQ}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_YIM --><li class="yahoo-icon"><a href="{postrow.U_YIM}" onclick="popup(this.href, 780, 550); return false;" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_AIM --><li class="aim-icon"><a href="{postrow.U_AIM}" onclick="popup(this.href, 550, 320); return false;" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_JABBER --><li class="jabber-icon"><a href="{postrow.U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
+					<!-- BEGIN custom_fields -->
+						<!-- IF postrow.custom_fields.S_PROFILE_CONTACT -->
+							<li class="{postrow.custom_fields.PROFILE_FIELD_IDENT}-icon">
+								<a href="<!-- IF postrow.custom_fields.PROFILE_FIELD_CONTACT -->{postrow.custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->">
+									<span>{postrow.custom_fields.PROFILE_FIELD_NAME}</span>
+								</a>
+							</li>
+						<!-- ENDIF -->
+					<!-- END custom_fields -->
 				</ul>
 			</dd>
 		<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 57d9a33c12..0b8030b6b3 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -849,7 +849,7 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	padding-right: 11px;
 	padding-left: 0;
 }
-.rtl .imageset.icon_contact_aim, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_msnm, .rtl .imageset.icon_contact_www, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn {
+.rtl .imageset.icon_contact_aim, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.phpbb_icq-icon, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_msnm, .rtl .imageset.phpbb_wlm-icon, .rtl .imageset.icon_contact_www, .rtl .imageset.phpbb_website-icon, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn {
 	padding-right: 20px;
 	padding-left: 0;
 }
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 89fdcd85a8..66355503a7 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -240,8 +240,11 @@ ul.profile-icons.responsive a.responsive-menu-link:before {
 .aim-icon, .aim-icon a			{ background: none top left no-repeat; }
 .yahoo-icon, .yahoo-icon a		{ background: none top left no-repeat; }
 .web-icon, .web-icon a			{ background: none top left no-repeat; }
+.phpbb_website-icon, .phpbb_website-icon a	{ background: none top left no-repeat; }
 .msnm-icon, .msnm-icon a			{ background: none top left no-repeat; }
+.phpbb_wlm-icon, .phpbb_wlm-icon a			{ background: none top left no-repeat; }
 .icq-icon, .icq-icon a			{ background: none top left no-repeat; }
+.phpbb_icq-icon, .phpbb_icq-icon a			{ background: none top left no-repeat; }
 .jabber-icon, .jabber-icon a		{ background: none top left no-repeat; }
 .pm-icon, .pm-icon a				{ background: none top left no-repeat; }
 .quote-icon, .quote-icon a		{ background: none top left no-repeat; }
@@ -258,8 +261,11 @@ ul.profile-icons li.email-icon		{ width: 20px; height: 20px; }
 ul.profile-icons li.aim-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.yahoo-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.web-icon	{ width: 20px; height: 20px; }
+ul.profile-icons li.phpbb_website-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.msnm-icon	{ width: 20px; height: 20px; }
+ul.profile-icons li.phpbb_wlm-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.icq-icon	{ width: 20px; height: 20px; }
+ul.profile-icons li.phpbb_icq-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.jabber-icon	{ width: 20px; height: 20px; }
 ul.profile-icons li.pm-icon		{ width: 28px; height: 20px; }
 ul.profile-icons li.quote-icon	{ width: 54px; height: 20px; }
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 1d4c657a14..adaf507bd5 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -742,8 +742,11 @@ a.sendemail {
 .aim-icon, .aim-icon a			{ background-image: url("./images/icon_contact_aim.gif"); }
 .yahoo-icon, .yahoo-icon a		{ background-image: url("./images/icon_contact_yahoo.gif"); }
 .web-icon, .web-icon a			{ background-image: url("./images/icon_contact_www.gif"); }
+.phpbb_website-icon, .phpbb_website-icon a			{ background-image: url("./images/icon_contact_www.gif"); }
 .msnm-icon, .msnm-icon a			{ background-image: url("./images/icon_contact_msnm.gif"); }
+.phpbb_wlm-icon, .phpbb_wlm-icon a			{ background-image: url("./images/icon_contact_msnm.gif"); }
 .icq-icon, .icq-icon a			{ background-image: url("./images/icon_contact_icq.gif"); }
+.phpbb_icq-icon, .phpbb_icq-icon a			{ background-image: url("./images/icon_contact_icq.gif"); }
 .jabber-icon, .jabber-icon a		{ background-image: url("./images/icon_contact_jabber.gif"); }
 .pm-icon, .pm-icon a				{ background-image: url("./en/icon_contact_pm.gif"); }
 .quote-icon, .quote-icon a		{ background-image: url("./en/icon_post_quote.gif"); }
diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css
index 7aa19df06e..9482a01f12 100644
--- a/phpBB/styles/prosilver/theme/imageset.css
+++ b/phpBB/styles/prosilver/theme/imageset.css
@@ -270,7 +270,7 @@ span.imageset {
 	padding-left: 20px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_icq {
+.imageset.icon_contact_icq, .imageset.phpbb_icq-icon {
 	background-image: url("./images/icon_contact_icq.gif");
 	padding-left: 20px;
 	padding-top: 20px;
@@ -280,12 +280,12 @@ span.imageset {
 	padding-left: 20px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_msnm {
+.imageset.phpbb_wlm-icon, .imageset.icon_contact_msnm {
 	background-image: url("./images/icon_contact_msnm.gif");
 	padding-left: 20px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_www {
+.imageset.icon_contact_www, .imageset.phpbb_website-icon {
 	background-image: url("./images/icon_contact_www.gif");
 	padding-left: 20px;
 	padding-top: 20px;
author	Nils Adermann <naderman@naderman.de>	2014-03-05 11:49:11 +0100
committer	Nils Adermann <naderman@naderman.de>	2014-03-05 11:49:11 +0100
commit	0e35a8515598b6cdf38c2b98ecde9e8cc984e594 (patch)
tree	c1250a6fc14fcd1eb7b539a3df8d66790d0bc460 /phpBB/styles/prosilver
parent	4e144005f0ecca45601f2a90b066144f75c6f165 (diff)
parent	83a7e632b9b21fed88a3dbea679580d0740664f7 (diff)
download	forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.gz forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.bz2 forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.tar.xz forums-0e35a8515598b6cdf38c2b98ecde9e8cc984e594.zip