[dw-free] Add Pinboard to "other services" section of profile

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/801369e4169a]

http://bugs.dwscoalition.org/show_bug.cgi?id=4249

Add Pinboard, Plurk, Tumblr to the profile.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/proplists.dat
• cgi-bin/DW/Logic/ProfilePage.pm
• htdocs/img/profile_icons/pinboard.png
• htdocs/img/profile_icons/plurk.png
• htdocs/img/profile_icons/tumblr.png
• htdocs/manage/profile/index.bml
• htdocs/manage/profile/index.bml.text
• htdocs/profile.bml.text

--------------------------------------------------------------------------------
diff -r a6fb17577eae -r 801369e4169a bin/upgrading/proplists.dat
--- a/bin/upgrading/proplists.dat	Mon Jan 30 19:19:28 2012 +0800
+++ b/bin/upgrading/proplists.dat	Mon Jan 30 19:48:40 2012 +0800
@@ -990,6 +990,22 @@
   multihomed: 0
   prettyname: Show CAPTCHA on commenting
 
+userproplist.pinboard:
+  cldversion: 4
+  datatype: char
+  des: Pinboard user account name
+  indexed: 0
+  multihomed: 0
+  prettyname: Pinboard user account name
+
+userproplist.plurk:
+  cldversion: 4
+  datatype: char
+  des: Plurk user account name
+  indexed: 0
+  multihomed: 0
+  prettyname: Plurk user account name
+
 userproplist.posting_guidelines_entry:
   cldversion: 4
   datatype: char
@@ -1174,6 +1190,14 @@
   multihomed: 0
   prettyname: Timezone
 
+userproplist.tumblr:
+  cldversion: 4
+  datatype: char
+  des: Tumblr user account name
+  indexed: 0
+  multihomed: 0
+  prettyname: Tumblr user account name
+
 userproplist.twitter:
   cldversion: 4
   datatype: char
diff -r a6fb17577eae -r 801369e4169a cgi-bin/DW/Logic/ProfilePage.pm
--- a/cgi-bin/DW/Logic/ProfilePage.pm	Mon Jan 30 19:19:28 2012 +0800
+++ b/cgi-bin/DW/Logic/ProfilePage.pm	Mon Jan 30 19:48:40 2012 +0800
@@ -886,6 +886,39 @@
         };
     }
 
+    if ( my $pinboard = $u->prop( 'pinboard' ) ) {
+        my $pinboard = LJ::eurl( $pinboard );
+        push @ret, {
+            type => 'pinboard',
+            text => LJ::ehtml( $pinboard ),
+            url => "http://pinboard.in/u:$pinboard",
+            image => 'pinboard.png',
+            title_ml => '.service.pinboard',
+        };
+    }
+
+    if ( my $plurk = $u->prop( 'plurk' ) ) {
+        my $plurk = LJ::eurl( $plurk );
+        push @ret, {
+            type => 'plurk',
+            text => LJ::ehtml( $plurk ),
+            url => "http://www.plurk.com/$plurk",
+            image => 'plurk.png',
+            title_ml => '.service.plurk',
+        };
+    }
+
+    if ( my $tumblr = $u->prop( 'tumblr' ) ) {
+        my $tumblr = LJ::eurl( $tumblr );
+        push @ret, {
+            type => 'tumblr',
+            text => LJ::ehtml( $tumblr ),
+            url => "http://$tumblr.tumblr.com",
+            image => 'tumblr.png',
+            title_ml => '.service.tumblr',
+        };
+    }
+
     return @ret;
 }
 
diff -r a6fb17577eae -r 801369e4169a htdocs/img/profile_icons/pinboard.png
Binary file htdocs/img/profile_icons/pinboard.png has changed
diff -r a6fb17577eae -r 801369e4169a htdocs/img/profile_icons/plurk.png
Binary file htdocs/img/profile_icons/plurk.png has changed
diff -r a6fb17577eae -r 801369e4169a htdocs/img/profile_icons/tumblr.png
Binary file htdocs/img/profile_icons/tumblr.png has changed
diff -r a6fb17577eae -r 801369e4169a htdocs/manage/profile/index.bml
--- a/htdocs/manage/profile/index.bml	Mon Jan 30 19:19:28 2012 +0800
+++ b/htdocs/manage/profile/index.bml	Mon Jan 30 19:48:40 2012 +0800
@@ -52,10 +52,11 @@
     # load user props
     $u->preload_props( { use_master => 1 },
         qw/ country state city timezone
-          icq aolim yahoo msn url jabber
-          google_talk skype twitter
-          delicious ravelry etsy diigo
-          urlname gender last_fm_user
+          aolim google_talk icq jabber
+          msn skype yahoo tumblr
+          plurk twitter delicious diigo
+          pinboard last_fm_user
+          etsy ravelry url urlname gender
           opt_hidefriendofs opt_hidememberofs
           sidx_bdate sidx_bday sidx_loc
           opt_showmutualfriends
@@ -424,16 +425,22 @@
             my $oddeven = 0;
 
             foreach my $p (
-                           ["aolim", $ML{'.chat.aolim'}, 28], ["icq", $ML{'.chat.icquin'}, 12],
-                           ["yahoo", $ML{'.chat.yahooid'}, 33], ["msn", $ML{'.chat.msnusername'}, 60],
-                           ["jabber", $ML{'.chat.jabber'}, 60], ["google_talk", $ML{'.chat.googletalk'}, 60],
+                           ["aolim", $ML{'.chat.aolim'}, 28],
+                           ["google_talk", $ML{'.chat.googletalk'}, 60],
+                           ["icq", $ML{'.chat.icquin'}, 12],
+                           ["jabber", $ML{'.chat.jabber'}, 60],
+                           ["msn", $ML{'.chat.msnusername'}, 60],
                            ["skype", $ML{'.chat.skype'}, 40],
+                           ["yahoo", $ML{'.chat.yahooid'}, 33],
+                           ["tumblr", $ML{ '.services.tumblr' }, 255],
+                           ["plurk", $ML{ '.services.plurk' }, 255],
                            ["twitter", $ML{ '.services.twitter' }, 40],
                            ["delicious", $ML{ '.services.delicious' }, 40],
                            ["diigo", $ML{ '.services.diigo' }, 16],
+                           ["pinboard", $ML{'.services.pinboard'}, 30],
+                           ["last_fm_user", $ML{'.services.last_fm'}, 255],
+                           ["etsy", $ML{ '.services.etsy' }, 20],
                            ["ravelry", $ML{ '.services.ravelry' }, 40],
-                           ["etsy", $ML{ '.services.etsy' }, 20],
-                           ["last_fm_user", $ML{'.services.last_fm'}, 255],
                           )
 
             {
@@ -684,10 +691,11 @@
 
             my @uprops = qw(
               opt_whatemailshow comm_theme
-              icq aolim yahoo msn url jabber
-              google_talk skype twitter
-              delicious ravelry etsy diigo
-              urlname gender last_fm_user
+              aolim google_talk icq jabber
+              msn skype yahoo tumblr
+              plurk twitter delicious diigo
+              pinboard last_fm_user
+              etsy ravelry url urlname gender
               opt_hidefriendofs opt_hidememberofs
               sidx_bdate sidx_bday
               opt_showmutualfriends
diff -r a6fb17577eae -r 801369e4169a htdocs/manage/profile/index.bml.text
--- a/htdocs/manage/profile/index.bml.text	Mon Jan 30 19:19:28 2012 +0800
+++ b/htdocs/manage/profile/index.bml.text	Mon Jan 30 19:48:40 2012 +0800
@@ -193,16 +193,22 @@
 
 .services.delicious=Delicious Username
 
+.services.diigo=Diigo Username
+
 .services.etsy=Etsy Username
 
-.services.diigo=Diigo Username
+.services.last_fm=Last.fm Username
 
-.services.last_fm=Last.fm Username
+.services.pinboard=Pinboard Username
+
+.services.plurk=Plurk Username
 
 .services.ravelry=Ravelry Username
 
 .services.twitter=Twitter Username
 
+.services.tumblr=Tumblr Username
+
 .show.birthday.day2=Show only month and day
 
 .show.birthday.full2=Show month, day, and year
diff -r a6fb17577eae -r 801369e4169a htdocs/profile.bml.text
--- a/htdocs/profile.bml.text	Mon Jan 30 19:19:28 2012 +0800
+++ b/htdocs/profile.bml.text	Mon Jan 30 19:48:40 2012 +0800
@@ -405,8 +405,14 @@
 
 .service.etsy=Etsy
 
+.service.pinboard=Pinboard
+
+.service.plurk=Plurk
+
 .service.ravelry=Ravelry
 
+.service.tumblr=Tumblr
+
 .service.twitter=Twitter
 
 .syn.header=Feeds
--------------------------------------------------------------------------------