[ljcom] r10085: LJSUP-7762: Mail.ru connect

U   trunk/bin/upgrading/proplists-local.dat
U   trunk/cgi-bin/LJ/Hooks/Userinfo.pm
U   trunk/htdocs/manage/profile/index.bml.text.local

Modified: trunk/bin/upgrading/proplists-local.dat
===================================================================
--- trunk/bin/upgrading/proplists-local.dat	2011-02-18 11:27:57 UTC (rev 10084)
+++ trunk/bin/upgrading/proplists-local.dat	2011-02-18 12:52:03 UTC (rev 10085)
@@ -674,3 +674,11 @@
   datatype: char
   des: link in mail.ru for this identity account
   prettyname: mail.ru nick
+
+userproplist.im_mailru:
+  indexed: 0
+  cldversion: 8
+  multihomed: 0
+  datatype: char
+  des: connection link in mail.ru for personal account
+  prettyname: user-entered connection to mail.ru

Modified: trunk/cgi-bin/LJ/Hooks/Userinfo.pm
===================================================================
--- trunk/cgi-bin/LJ/Hooks/Userinfo.pm	2011-02-18 11:27:57 UTC (rev 10084)
+++ trunk/cgi-bin/LJ/Hooks/Userinfo.pm	2011-02-18 12:52:03 UTC (rev 10085)
@@ -488,6 +488,19 @@
         };
     }
 
+    if ($u->prop('im_mailru')) {
+        my $connect = LJ::ehtml($u->prop('im_mailru'));
+
+        $ret .= qq{
+            <tr class='im_lj'>
+                <td class='im_icon'>
+                    <img src='$LJ::IMGPREFIX/mailru-profile.gif' alt='' />
+                </td>
+                <td colspan="2">$connect</td>
+            </tr>
+        };
+    }
+
     unless ($u->hide_ljtalk) {
         my $jab_title = LJ::run_hook('jabber_title');
         my $jab_link = LJ::run_hook('jabber_link');
@@ -583,6 +596,16 @@
 
     $ret .= "</td></tr>\n";
 
+    $ret .= "<tr><td class='field_name'>" . LJ::Lang::ml('/manage/profile/index.bml.chat.mailru') . "</td><td>";
+    $ret .= LJ::html_text({
+        'name' => 'contact_mailru',
+        'value' => $u->prop('im_mailru'),
+        'size' => '20',
+        'maxlength' => 150,
+    });
+
+    $ret .= "</td></tr>\n";
+
     return $ret;
 });
 
@@ -591,6 +614,7 @@
     my ($u) = @_;
 
     $u->set_prop('im_openid' => LJ::Request->post_param('contact_openid'));
+    $u->set_prop('im_mailru' => LJ::Request->post_param('contact_mailru'));
 });
 
 1;

Modified: trunk/htdocs/manage/profile/index.bml.text.local
===================================================================
--- trunk/htdocs/manage/profile/index.bml.text.local	2011-02-18 11:27:57 UTC (rev 10084)
+++ trunk/htdocs/manage/profile/index.bml.text.local	2011-02-18 12:52:03 UTC (rev 10085)
@@ -13,6 +13,8 @@
 
 .chat.openid=OpenID
 
+.chat.mailru=Mail.ru
+
 .chat.msnusername=Windows LiveID 
 
 .chat.twitter=Twitter