[livejournal] r21279: LJSUP-11352: Partnership with Trava.ru

LJSUP-11352: Partnership with Trava.ru

U   trunk/bin/upgrading/proplists.dat
U   trunk/htdocs/manage/profile/index.bml
U   trunk/htdocs/manage/settings/index.bml

Modified: trunk/bin/upgrading/proplists.dat
===================================================================
--- trunk/bin/upgrading/proplists.dat	2012-03-02 06:43:40 UTC (rev 21278)
+++ trunk/bin/upgrading/proplists.dat	2012-03-02 06:58:21 UTC (rev 21279)
@@ -1791,4 +1791,10 @@
   datatype: bool
   des: 0: default, do not send emails about rejection from moderation, 1: send them
   indexed: 0
-  prettyname: Send emails about rejection from moderation
\ No newline at end of file
+  prettyname: Send emails about rejection from moderation
+
+userproplist.trava_uid:
+  datatype: char
+  des: user id in trava.ru
+  prettyname: user id in trava.ru
+  indexed: 0

Modified: trunk/htdocs/manage/profile/index.bml
===================================================================
--- trunk/htdocs/manage/profile/index.bml	2012-03-02 06:43:40 UTC (rev 21278)
+++ trunk/htdocs/manage/profile/index.bml	2012-03-02 06:58:21 UTC (rev 21279)
@@ -70,7 +70,7 @@
           country state city zip timezone
           icq aolim yahoo msn url jabber
           google_talk skype gizmo
-          urlname gender last_fm_user opt_hidefriendofs
+          urlname gender opt_hidefriendofs
           sidx_bdate sidx_bday sidx_loc
           opt_showmutualfriends opt_showschools
           opt_showbday opt_showlocation
@@ -490,12 +490,6 @@
             $ret .= "</td></tr>\n";
         }
 
-        # last_fm_user
-        $ret .= "<tr><td class='field_name'>$ML{'.fn.last_fm'}</td><td>";
-        $ret .= LJ::html_text({ 'name' => 'last_fm_user', 'value' => $u->{'last_fm_user'}, 'size' => '20', 'maxlength' => '255' });
-        $ret .= "<div class='helper'>$ML{'.fn.last_fm.desc'}</div></td></tr>";
-        $ret .= "</td></tr>\n";
-
         } # end is_person check
 
         $ret .= "</table>\n";
@@ -906,7 +900,7 @@
               opt_whatemailshow comm_theme
               icq aolim yahoo msn url jabber
               google_talk skype
-              urlname gender last_fm_user opt_hidefriendofs
+              urlname gender opt_hidefriendofs
               sidx_bdate sidx_bday
               opt_showmutualfriends opt_showschools
               opt_showbday opt_showlocation opt_showljtalk

Modified: trunk/htdocs/manage/settings/index.bml
===================================================================
--- trunk/htdocs/manage/settings/index.bml	2012-03-02 06:43:40 UTC (rev 21278)
+++ trunk/htdocs/manage/settings/index.bml	2012-03-02 06:58:21 UTC (rev 21279)
@@ -153,6 +153,7 @@
                 LJ::Setting::WebmasterTools::Yandex
                 LJ::Setting::GiveFeatures
                 LJ::Setting::LJTimes
+                LJ::Setting::Music
             )],
         },
     );