diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-02-04 01:30:04 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-02-04 01:31:43 +0100 |
| commit | 336187151a2010197ddda1bcdabc311fd10c1c87 (patch) | |
| tree | 6f16d15999e6ac5f158643619213acbf2a7daf7c /phpBB/styles/subsilver2 | |
| parent | 34c564062a95b9306487fbc6bbd17c7c9c8a63c4 (diff) | |
| download | forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar.gz forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar.bz2 forums-336187151a2010197ddda1bcdabc311fd10c1c87.tar.xz forums-336187151a2010197ddda1bcdabc311fd10c1c87.zip | |
[ticket/11201] Revert WLM dropping because it is still used in China.
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.
This commit reverts commits
- 460470229d972b93ef5a98b0d1d97a2a970d684f
- 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.
PHPBB3-11201
Diffstat (limited to 'phpBB/styles/subsilver2')
6 files changed, 104 insertions, 5 deletions
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html index e91a1caf11..da1ad661c3 100644 --- a/phpBB/styles/subsilver2/template/memberlist_im.html +++ b/phpBB/styles/subsilver2/template/memberlist_im.html @@ -2,6 +2,8 @@ <br clear="all" /> +<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger --> + <form method="post" action="{S_IM_ACTION}"> <table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center"> <tr> @@ -12,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_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_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> </tr> <!-- IF S_SEND_AIM --> @@ -24,6 +26,85 @@ </tr> <!-- ENDIF --> + <!-- IF S_SEND_MSNM --> + <tr> + <td class="row1" colspan="2" align="center"> + <object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object> + <script type="text/javascript"> + // <![CDATA[ + var app = document.getElementById('objMessengerApp'); + + /** + * Check whether the browser supports this and whether MSNM is connected + */ + function msn_supported() + { + // Does the browser support the MSNM object? + if (app.MyStatus) + { + // Is MSNM connected? + if (app.MyStatus == 1) + { + alert('{LA_IM_MSNM_CONNECT}'); + return false; + } + } + else + { + alert('{LA_IM_MSNM_BROWSER}'); + return false; + } + return true; + } + + /** + * Add to your contact list + */ + function add_contact(address) + { + if (msn_supported()) + { + // Could return an error while MSNM is connecting, don't want that + try + { + app.AddContact(0, address); + } + catch (e) + { + return; + } + } + } + + /** + * Write IM to contact + */ + function im_contact(address) + { + if (msn_supported()) + { + // Could return an error while MSNM is connecting, don't want that + try + { + app.InstantMessage(address); + } + catch (e) + { + return; + } + } + } + // ]]> + </script> + + <a class="gen" href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a> + </td> + </tr> + <tr> + <td class="cat" colspan="2" align="center"> </td> + </tr> + <!-- ENDIF --> + <!-- IF S_SEND_JABBER --> <tr> <td class="row1"><b class="genmed">{L_IM_MESSAGE}{L_COLON} </b></td> diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html index fb76cacc79..c0434d8110 100644 --- a/phpBB/styles/subsilver2/template/memberlist_search.html +++ b/phpBB/styles/subsilver2/template/memberlist_search.html @@ -102,14 +102,14 @@ <!-- ELSE --> <td colspan="2" class="row1"> </td> <!-- ENDIF --> - <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> + <td class="row1"><b class="genmed">{L_MSNM}{L_COLON}</b></td> + <td class="row2"><input class="post" type="text" name="msn" value="{MSNM}" /></td> </tr> <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="text" name="count" value="{COUNT}" /></td> - <td class="row1"> </td> - <td class="row2"> </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> diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index ff22dcc0f7..464369a7a8 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -117,6 +117,10 @@ </tr> <!-- ENDIF --> <tr> + <td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_MSNM}{L_COLON} </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}{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> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html index 69da5f6172..19259aebc8 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html @@ -21,6 +21,10 @@ <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_MSNM}{L_COLON} </b></td> + <td class="row2"><input class="post" type="text" name="msn" size="30" maxlength="255" value="{MSN}" /></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="text" name="yim" size="30" maxlength="255" value="{YIM}" /></td> </tr> diff --git a/phpBB/styles/subsilver2/theme/en/stylesheet.css b/phpBB/styles/subsilver2/theme/en/stylesheet.css index 6ddecf963b..563492d4fc 100644 --- a/phpBB/styles/subsilver2/theme/en/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/en/stylesheet.css @@ -19,6 +19,11 @@ 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; diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index e7e64eff32..977e5c20c6 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -1008,6 +1008,11 @@ a.imageset { 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; |