Merge lp:~mhall119/summit/fix-fb-widget into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 384
Merged at revision: 383
Proposed branch: lp:~mhall119/summit/fix-fb-widget
Merge into: lp:summit
Diff against target: 33 lines (+9/-9)
1 file modified
summit/schedule/templates/schedule/summit.html (+9/-9)
To merge this branch: bzr merge lp:~mhall119/summit/fix-fb-widget
Reviewer Review Type Date Requested Status
Summit Hackers Pending
Review via email: mp+104631@code.launchpad.net

This proposal supersedes a proposal from 2012-05-03.

Description of the change

Undo summit.html changes from rev 364 because the broke the FB widget

To post a comment you must log in.
Revision history for this message
James Tunnicliffe (dooferlad) wrote :

Interesting! I made the change because this way of doing the widget
broke the layout around it, but it seems that it is fine again.
Clearly we should delete all social media buttons because they are
antisocial for web developers (not that I would call myself a web
developer :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/templates/schedule/summit.html'
2--- summit/schedule/templates/schedule/summit.html 2012-05-02 05:14:17 +0000
3+++ summit/schedule/templates/schedule/summit.html 2012-05-03 21:41:20 +0000
4@@ -64,20 +64,20 @@
5 <article class="span-4 last">
6 <div class="share alone">
7 <a href="http://www.reddit.com/submit" onclick="window.location = 'http://www.reddit.com/submit?url=' + encodeURIComponent(window.location); return false"> <img style="padding-bottom: 4px; border: 0;" src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" /></a><br />
8-
9- <div class="social-widget">
10- <iframe src="//www.facebook.com/plugins/like.php?href&amp;send=false&amp;layout=box_count&amp;width=50&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font&amp;height=90" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:50px; height:90px;" allowTransparency="true"></iframe>
11- </div>
12-
13- <div class="social-widget">
14+ <div id="fb-root"></div>
15+ <script>(function(d, s, id) {
16+ var js, fjs = d.getElementsByTagName(s)[0];
17+ if (d.getElementById(id)) {return;}
18+ js = d.createElement(s); js.id = id;
19+ js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=310260202349342";
20+ fjs.parentNode.insertBefore(js, fjs);
21+ }(document, 'script', 'facebook-jssdk'));</script>
22+ <div class="fb-like" data-href="" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
23 <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
24 <g:plusone size="tall"></g:plusone>
25-
26 <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
27 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
28-
29 <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
30- </div>
31 </div>
32 </article>
33 </div>

Subscribers

People subscribed via source and target branches