[dw-free] Add archiveofourown.org & FanFiction.net to Other Sites in Profile

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/19ef41b78730]

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

Add AO3 and FF.net to Other Sites in profile.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/proplists.dat
• cgi-bin/DW/Logic/ProfilePage.pm
• htdocs/manage/profile/index.bml
• htdocs/manage/profile/index.bml.text
• htdocs/profile.bml.text

--------------------------------------------------------------------------------
diff -r 3902f52fa21e -r 19ef41b78730 bin/upgrading/proplists.dat
--- a/bin/upgrading/proplists.dat	Fri Feb 10 12:28:11 2012 +0800
+++ b/bin/upgrading/proplists.dat	Fri Feb 10 12:40:00 2012 +0800
@@ -14,6 +14,14 @@
   multihomed: 0
   prettyname: Adult Content Reason
 
+userproplist.ao3:
+  cldversion: 4
+  datatype: char
+  des: AO3 user account name
+  indexed: 0
+  multihomed: 0
+  prettyname: Archive of Our Own user account name
+
 userproplist.aolim:
   cldversion: 0
   datatype: char
@@ -358,6 +366,14 @@
   multihomed: 0
   prettyname: FOAF address
 
+userproplist.ffnet:
+  cldversion: 4
+  datatype: char
+  des: FanFiction.net user account name
+  indexed: 0
+  multihomed: 0
+  prettyname: FanFiction.net user account name
+
 userproplist.friendspagetitle:
   cldversion: 4
   datatype: char
diff -r 3902f52fa21e -r 19ef41b78730 cgi-bin/DW/Logic/ProfilePage.pm
--- a/cgi-bin/DW/Logic/ProfilePage.pm	Fri Feb 10 12:28:11 2012 +0800
+++ b/cgi-bin/DW/Logic/ProfilePage.pm	Fri Feb 10 12:40:00 2012 +0800
@@ -919,6 +919,28 @@
         };
     }
 
+    if ( my $ao3 = $u->prop( 'ao3' ) ) {
+        my $ao3 = LJ::eurl( $ao3 );
+        push @ret, {
+            type => 'ao3',
+            text => LJ::ehtml( $ao3 ),
+            url => "http://archiveofourown.org/users/$ao3",
+            image => 'ao3.png',
+            title_ml => '.service.ao3',
+        };
+    }
+
+    if ( my $ffnet = $u->prop( 'ffnet' ) ) {
+        my $ffnet = LJ::eurl( $ffnet );
+        push @ret, {
+            type => 'ffnet',
+            text => LJ::ehtml( $ffnet ),
+            url => "http://www.fanfiction.net/~$ffnet",
+            image => 'ffnet.png',
+            title_ml => '.service.ffnet',
+        };
+    }
+
     return @ret;
 }
 
diff -r 3902f52fa21e -r 19ef41b78730 htdocs/manage/profile/index.bml
--- a/htdocs/manage/profile/index.bml	Fri Feb 10 12:28:11 2012 +0800
+++ b/htdocs/manage/profile/index.bml	Fri Feb 10 12:40:00 2012 +0800
@@ -57,7 +57,8 @@
         msn skype yahoo tumblr
         plurk twitter delicious diigo
         pinboard last_fm_user
-        etsy ravelry url urlname gender
+        etsy ravelry ao3 ffnet
+        url urlname gender
         opt_hidefriendofs opt_hidememberofs
         sidx_bdate sidx_bday
         opt_showmutualfriends
@@ -444,6 +445,8 @@
                            ["last_fm_user", $ML{'.services.last_fm'}, 255],
                            ["etsy", $ML{ '.services.etsy' }, 20],
                            ["ravelry", $ML{ '.services.ravelry' }, 40],
+                           ["ao3", $ML{ '.services.ao3' }, 40],
+                           ["ffnet", $ML{ '.services.ffnet' }, 30],
                           )
 
             {
diff -r 3902f52fa21e -r 19ef41b78730 htdocs/manage/profile/index.bml.text
--- a/htdocs/manage/profile/index.bml.text	Fri Feb 10 12:28:11 2012 +0800
+++ b/htdocs/manage/profile/index.bml.text	Fri Feb 10 12:40:00 2012 +0800
@@ -191,12 +191,16 @@
 
 .select.provider=-- Select Carrier --
 
+.services.ao3=AO3 Username
+
 .services.delicious=Delicious Username
 
 .services.diigo=Diigo Username
 
 .services.etsy=Etsy Username
 
+.services.ffnet=FanFiction.net Username
+
 .services.last_fm=Last.fm Username
 
 .services.pinboard=Pinboard Username
diff -r 3902f52fa21e -r 19ef41b78730 htdocs/profile.bml.text
--- a/htdocs/profile.bml.text	Fri Feb 10 12:28:11 2012 +0800
+++ b/htdocs/profile.bml.text	Fri Feb 10 12:40:00 2012 +0800
@@ -399,12 +399,16 @@
 
 .sendmessage.body2=<a [[aopts]]>Send [[user]] a text message</a><br />on his/her cellphone/pager.
 
+.service.ao3=Archive of Our Own
+
 .service.delicious=Delicious
 
 .service.diigo=Diigo
 
 .service.etsy=Etsy
 
+.services.ffnet=FanFiction.net
+
 .service.pinboard=Pinboard
 
 .service.plurk=Plurk
--------------------------------------------------------------------------------