![[site community profile]](https://www.dreamwidth.org/img/comm_staff.png){kind=small}
[dw-free] Yoink Gizmo support
[commit: http://hg.dwscoalition.org/dw-free/rev/57dffa3b2531]
http://bugs.dwscoalition.org/show_bug.cgi?id=4008
Remove Gizmo from assorted places, mainly from the profile.
Patch by![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
ninetydegrees.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=4008
Remove Gizmo from assorted places, mainly from the profile.
Patch by
ninetydegrees.Files modified:
- bin/upgrading/deadphrases.dat
- bin/upgrading/proplists.dat
- cgi-bin/DW/Logic/ProfilePage.pm
- cgi-bin/LJ/User.pm
- htdocs/manage/profile/index.bml
- htdocs/manage/profile/index.bml.text
- htdocs/profile.bml.text
- htdocs/stc/contextualhover.css
--------------------------------------------------------------------------------
diff -r 13f1ef653e0a -r 57dffa3b2531 bin/upgrading/deadphrases.dat
--- a/bin/upgrading/deadphrases.dat Mon Nov 07 17:27:21 2011 +0800
+++ b/bin/upgrading/deadphrases.dat Mon Nov 07 17:34:49 2011 +0800
@@ -1489,3 +1489,7 @@
general talk.error.deleted
general talk.error.deleted.title
general /profile.bml.error.deleted.purgenotification
+
+general /profile.bml.label.gizmo
+general /profile.bml.label.gizmo3
+general /manage/profile/index.bml.chat.gizmo
\ No newline at end of file
diff -r 13f1ef653e0a -r 57dffa3b2531 bin/upgrading/proplists.dat
--- a/bin/upgrading/proplists.dat Mon Nov 07 17:27:21 2011 +0800
+++ b/bin/upgrading/proplists.dat Mon Nov 07 17:34:49 2011 +0800
@@ -382,14 +382,6 @@
multihomed: 0
prettyname: Gender
-userproplist.gizmo:
- cldversion: 0
- datatype: char
- des: Gizmo VoIP account ID
- indexed: 1
- multihomed: 0
- prettyname: Gizmo Project ID
-
userproplist.google_talk:
cldversion: 0
datatype: char
diff -r 13f1ef653e0a -r 57dffa3b2531 cgi-bin/DW/Logic/ProfilePage.pm
--- a/cgi-bin/DW/Logic/ProfilePage.pm Mon Nov 07 17:27:21 2011 +0800
+++ b/cgi-bin/DW/Logic/ProfilePage.pm Mon Nov 07 17:34:49 2011 +0800
@@ -818,15 +818,6 @@
push @ret, $service;
}
- if ( my $gizmo = $u->gizmo_account ) {
- push @ret, {
- type => 'gizmo',
- email => LJ::ehtml( $gizmo ),
- image => 'gizmo.gif',
- title_ml => '.im.gizmo',
- };
- }
-
if ( my $lastfm = $u->prop( 'last_fm_user' ) ) {
my $elastfm = LJ::eurl( $lastfm );
my $lastfm_url = 'http://www.last.fm/user/%username%';
diff -r 13f1ef653e0a -r 57dffa3b2531 cgi-bin/LJ/User.pm
--- a/cgi-bin/LJ/User.pm Mon Nov 07 17:27:21 2011 +0800
+++ b/cgi-bin/LJ/User.pm Mon Nov 07 17:34:49 2011 +0800
@@ -2439,31 +2439,6 @@
}
-# get/set the gizmo account of a user
-sub gizmo_account {
- my $u = shift;
-
- # parse out their account information
- my $acct = $u->prop( 'gizmo' );
- my ($validated, $gizmo);
- if ($acct && $acct =~ /^([01]);(.+)$/) {
- ($validated, $gizmo) = ($1, $2);
- }
-
- # setting the account
- # all account sets are initially unvalidated
- if (@_) {
- my $newgizmo = shift;
- $u->set_prop( 'gizmo' => "0;$newgizmo" );
-
- # purge old memcache keys
- LJ::MemCache::delete( "gizmo-ljmap:$gizmo" );
- }
-
- # return the information (either account + validation or just account)
- return wantarray ? ($gizmo, $validated) : $gizmo unless @_;
-}
-
# get/set the Google Analytics ID
sub google_analytics {
my $u = shift;
diff -r 13f1ef653e0a -r 57dffa3b2531 htdocs/manage/profile/index.bml
--- a/htdocs/manage/profile/index.bml Mon Nov 07 17:27:21 2011 +0800
+++ b/htdocs/manage/profile/index.bml Mon Nov 07 17:34:49 2011 +0800
@@ -54,8 +54,8 @@
$u->preload_props( { use_master => 1 },
qw/ country state city timezone
icq aolim yahoo msn url jabber
- google_talk skype gizmo
- twitter delicious ravelry etsy diigo
+ google_talk skype twitter
+ delicious ravelry etsy diigo
urlname gender last_fm_user
opt_hidefriendofs opt_hidememberofs
sidx_bdate sidx_bday sidx_loc
@@ -422,8 +422,6 @@
$ML{'.fn.privacy'}: $curr_privacy</a></td></tr>\n
};
- $u->{'gizmo'} = $u->gizmo_account();
-
$ret .= "<tr><td colspan=3><table summary=''>";
my $oddeven = 0;
@@ -432,12 +430,11 @@
["yahoo", $ML{'.chat.yahooid'}, 33], ["msn", $ML{'.chat.msnusername'}, 60],
["jabber", $ML{'.chat.jabber'}, 60], ["google_talk", $ML{'.chat.googletalk'}, 60],
["skype", $ML{'.chat.skype'}, 40],
- ["gizmo", $ML{'.chat.gizmo'}, 40],
["twitter", $ML{ '.services.twitter' }, 40],
["delicious", $ML{ '.services.delicious' }, 40],
+ ["diigo", $ML{ '.services.diigo' }, 16],
["ravelry", $ML{ '.services.ravelry' }, 40],
["etsy", $ML{ '.services.etsy' }, 20],
- ["diigo", $ML{ '.services.diigo' }, 16],
["last_fm_user", $ML{'.services.last_fm'}, 255],
)
@@ -694,8 +691,8 @@
my @uprops = qw(
opt_whatemailshow comm_theme
icq aolim yahoo msn url jabber
- google_talk skype
- twitter delicious ravelry etsy diigo
+ google_talk skype twitter
+ delicious ravelry etsy diigo
urlname gender last_fm_user
opt_hidefriendofs opt_hidememberofs
sidx_bdate sidx_bday
@@ -704,10 +701,6 @@
opt_sharebday opt_showonlinestatus
);
- # reset the gizmo account for this user account
- $u->gizmo_account( $POST{'gizmo'} )
- if $u->gizmo_account ne $POST{'gizmo'};
-
# set userprops
my %prop;
foreach my $uprop (@uprops) {
diff -r 13f1ef653e0a -r 57dffa3b2531 htdocs/manage/profile/index.bml.text
--- a/htdocs/manage/profile/index.bml.text Mon Nov 07 17:27:21 2011 +0800
+++ b/htdocs/manage/profile/index.bml.text Mon Nov 07 17:34:49 2011 +0800
@@ -1,8 +1,6 @@
;; -*- coding: utf-8 -*-
.chat.aolim=AOL IM
-.chat.gizmo=Gizmo Project
-
.chat.googletalk=Google Talk
.chat.icquin=ICQ UIN
diff -r 13f1ef653e0a -r 57dffa3b2531 htdocs/profile.bml.text
--- a/htdocs/profile.bml.text Mon Nov 07 17:27:21 2011 +0800
+++ b/htdocs/profile.bml.text Mon Nov 07 17:34:49 2011 +0800
@@ -155,8 +155,6 @@
.im.aol.status=AIM status
-.im.gizmo=Gizmo
-
.im.gtalk=Google Talk
.im.header=Instant Message:
@@ -215,10 +213,6 @@
.label.frsyndication2=Feeds
-.label.gizmo=Gizmo Project:
-
-.label.gizmo3=Gizmo Project:
-
.label.googletalk=Google Talk:
.label.hidden=(hidden)
diff -r 13f1ef653e0a -r 57dffa3b2531 htdocs/stc/contextualhover.css
--- a/htdocs/stc/contextualhover.css Mon Nov 07 17:27:21 2011 +0800
+++ b/htdocs/stc/contextualhover.css Mon Nov 07 17:34:49 2011 +0800
@@ -44,10 +44,6 @@
font-weight: bold;
}
- div.ContextualPopup .Content .GizmoBlurb {
- font-size: smaller;
- }
-
div.ContextualPopup .Userpic {
float: right;
top: 0;
--------------------------------------------------------------------------------