Андрей (andy) wrote in changelog,
Андрей
andy
changelog

[livejournal] r18903: LJSUP-8463 (Remove share this!)

Committer: ailyin
LJSUP-8463 (Remove share this!)
U   trunk/bin/upgrading/en.dat
U   trunk/bin/upgrading/s2layers/core1.s2
U   trunk/cgi-bin/LJ/S2.pm
U   trunk/cgi-bin/LJ/Talk.pm
U   trunk/cgi-bin/imageconf.pl
U   trunk/htdocs/browse/index.bml
U   trunk/htdocs/talkpost.bml
U   trunk/htdocs/talkread.bml
U   trunk/templates/Browse/recent_posts.tmpl
Modified: trunk/bin/upgrading/en.dat
===================================================================
--- trunk/bin/upgrading/en.dat	2011-04-18 10:08:30 UTC (rev 18902)
+++ trunk/bin/upgrading/en.dat	2011-04-19 01:17:46 UTC (rev 18903)
@@ -2687,8 +2687,6 @@
 
 img.prev_entry=Previous Entry
 
-img.sharethis=Share this!
-
 img.share=Share
 
 img.tellfriend=Tell a Friend!

Modified: trunk/bin/upgrading/s2layers/core1.s2
===================================================================
--- trunk/bin/upgrading/s2layers/core1.s2	2011-04-18 10:08:30 UTC (rev 18902)
+++ trunk/bin/upgrading/s2layers/core1.s2	2011-04-19 01:17:46 UTC (rev 18903)
@@ -1434,8 +1434,10 @@
 }
 set text_tell_friend = "Tell a Friend";
 
+# we're keeping this one for backwards compatibility
 property string text_share_this {
     des = "Text to share this with a friend";
+    noui = 1;
 }
 set text_share_this = "Share";
 

Modified: trunk/cgi-bin/LJ/S2.pm
===================================================================
--- trunk/cgi-bin/LJ/S2.pm	2011-04-18 10:08:30 UTC (rev 18902)
+++ trunk/cgi-bin/LJ/S2.pm	2011-04-19 01:17:46 UTC (rev 18903)
@@ -153,10 +153,6 @@
     }
 
     $page->{head_content} .= LJ::res_includes() . $extra_js;
-    if ( LJ::is_enabled('sharethis') ) {
-        ## generate <script src ..> to load ShareThis script with needed for journal set of services
-        $page->{head_content} .= $LJ::SHARE_THIS_URL_GEN->(journal => $u->username);
-    }
     LJ::run_hooks('head_content', \$page->{head_content});
 
     s2_run($r, $ctx, $opts, $entry, $page);
@@ -3789,19 +3785,8 @@
     }
 
     if ($key eq "tell_friend") {
-        return $null_link if $LJ::DISABLED{'sharethis'};
-        return $null_link unless $entry->security eq 'public';
-        my $entry_url = $entry->url;
-        my $entry_title = LJ::ejs($entry->subject_html);
-        my $link = LJ::S2::Link("#", $ctx->[S2::PROPS]->{"text_share_this"}, LJ::S2::Image("$LJ::IMGPREFIX/btn_share.gif", 24, 24));
-        $link->{_raw} = qq|<script type="text/javascript">
-            var stLink = jQuery('a:last')[0];
-            stLink.href = 'javascript:void(0)';
-            SHARETHIS_post = SHARETHIS.addEntry({url:'$entry_url', title: '$entry_title'}, {button: false});
-            SHARETHIS_post.attachButton(stLink);
-            SHARETHIS_ary.push(SHARETHIS_post);
-            </script>|;
-        return $link;
+        # after share this! has been nuked, this one is gone too
+        return $null_link;
     }
 
     if ( $key eq 'share' ) {

Modified: trunk/cgi-bin/LJ/Talk.pm
===================================================================
--- trunk/cgi-bin/LJ/Talk.pm	2011-04-18 10:08:30 UTC (rev 18902)
+++ trunk/cgi-bin/LJ/Talk.pm	2011-04-19 01:17:46 UTC (rev 18903)
@@ -145,16 +145,6 @@
         }
     }
 
-    unless ($LJ::DISABLED{'sharethis'}) {
-        my $entry_url = $entry->url;
-        my $entry_title = LJ::ejs($entry->subject_html);
-        push @linkele, $mlink->("javascript:void(0)", "sharethis") . qq|<script type="text/javascript">
-            SHARETHIS.addEntry({url:'$entry_url', title: '$entry_title'}, {button: false})
-                .attachButton(jQuery('a:last')[0]);
-            </script>|
-            if $entry->security eq 'public';
-    }
-
     if ( LJ::is_enabled('sharing') && $entry->is_public ) {
         LJ::Share->request_resources;
         push @linkele, $mlink->( '#', 'share' )

Modified: trunk/cgi-bin/imageconf.pl
===================================================================
--- trunk/cgi-bin/imageconf.pl	2011-04-18 10:08:30 UTC (rev 18902)
+++ trunk/cgi-bin/imageconf.pl	2011-04-19 01:17:46 UTC (rev 18903)
@@ -166,13 +166,6 @@
     'alt' => 'img.editcomment',
 };
 
-$img{'sharethis'} = {
-    'src' => '/btn_sharethis.gif?v=2',
-    'width' => 24,
-    'height' => 24,
-    'alt' => 'img.sharethis',
-};
-
 $img{'share'} = {
     'src' => '/btn_share.gif?v=1',
     'width' => 24,

Modified: trunk/htdocs/browse/index.bml
===================================================================
--- trunk/htdocs/browse/index.bml	2011-04-18 10:08:30 UTC (rev 18902)
+++ trunk/htdocs/browse/index.bml	2011-04-19 01:17:46 UTC (rev 18903)
@@ -10,7 +10,6 @@
 
 
     $windowtitle = "Community Directory";
-    $headextra .= $LJ::SHARE_THIS_URL_GEN->(journal => undef);
 
     my $remote = LJ::get_remote();
     return "You do not have access to this page." unless LJ::is_enabled("browse", $remote);

Modified: trunk/htdocs/talkpost.bml
===================================================================
--- trunk/htdocs/talkpost.bml	2011-04-18 10:08:30 UTC (rev 18902)
+++ trunk/htdocs/talkpost.bml	2011-04-19 01:17:46 UTC (rev 18903)
@@ -156,8 +156,6 @@
     if (!$u->is_visible || $u->should_block_robots || ($entry && $entry->should_block_robots)) {
         $head = LJ::robot_meta_tags();
     }
-    $head .= $LJ::SHARE_THIS_URL_GEN->(journal => $u->username)
-        unless $LJ::DISABLED{'sharethis'};
 
     # check suspended user
     return "<?h1 $ML{'talk.error.suspended.title'} h1?><?p $ML{'talk.error.suspended'} p?>"

Modified: trunk/htdocs/talkread.bml
===================================================================
--- trunk/htdocs/talkread.bml	2011-04-18 10:08:30 UTC (rev 18902)
+++ trunk/htdocs/talkread.bml	2011-04-19 01:17:46 UTC (rev 18903)
@@ -98,9 +98,6 @@
         $$head .= LJ::robot_meta_tags();
     }
 
-    $$head .= $LJ::SHARE_THIS_URL_GEN->(journal => $u->username)
-       unless $LJ::DISABLED{'sharethis'};
-
     unless ($item && $item->{'anum'} == $init->{'anum'}) {
         LJ::Request->pnotes ('error' => 'e404');
         LJ::Request->pnotes ('remote' => LJ::get_remote());

Modified: trunk/templates/Browse/recent_posts.tmpl
===================================================================
--- trunk/templates/Browse/recent_posts.tmpl	2011-04-18 10:08:30 UTC (rev 18902)
+++ trunk/templates/Browse/recent_posts.tmpl	2011-04-19 01:17:46 UTC (rev 18903)
@@ -29,26 +29,12 @@
 		<ul class="b-share">
 			<li class="b-share-fb"><a href="http://facebook.com/sharer.php?u=<tmpl_var expr="eurl(url_to_post)">" target="_blank">">facebook</a></li>
 			<li class="b-share-twitter"><a href="http://twitter.com/share?url=<tmpl_var expr="eurl(url_to_post)">&text=<tmpl_var expr="eurl(subject)">" target="_blank">twitter</a></li>
-            <tmpl_if expr="lj_enabled('sharethis')">
-                <li class="b-share-sharethis"><a href="javascript:void(0);">sharethis</a></li>
-            </tmpl_if>
             <tmpl_if expr="lj_enabled('sharing')">
                 <li class="b-share-sharethis"><a href="#">share</a><tmpl_var sharing_js></li>
             </tmpl_if>
 			<li class="b-share-email"><a href="javascript:void(0);">mail</a></li>
 			<li class="b-share-fb-like"><iframe src="http://www.facebook.com/plugins/like.php?href=<tmpl_var expr="eurl(url_to_post)">&amp;layout=button_count&amp;show_faces=true&amp;width=150&amp;action=like&amp;font=verdana&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true"></iframe></li>
 		</ul>
-        <tmpl_if expr="lj_enabled('sharethis')">
-            <script type="text/javascript">
-            (function() {
-                var s = SHARETHIS.addEntry({url:'<tmpl_var url_to_post>', title: '<tmpl_var expr="ejs(subject)">'}, {button: false});
-                var ul = jQuery('ul:last');
-
-                s.attachButton( ul.find('.b-share-sharethis a')[0]);
-                s.attachChicklet("email", ul.find('.b-share-email a')[0]);
-            }());
-            </script>
-        </tmpl_if>
         <tmpl_if expr="lj_enabled('sharing')">
             <script type="text/javascript">
             (function() {

Tags: andy, bml, dat, livejournal, pl, pm, s2, tmpl
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments