Merge lp:~daker/loco-team-portal/fix.889567 into lp:loco-team-portal

Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Chris Johnston
Approved revision: 515
Merged at revision: 510
Proposed branch: lp:~daker/loco-team-portal/fix.889567
Merge into: lp:loco-team-portal
Diff against target: 72 lines (+44/-0)
2 files modified
loco_directory/templates/events/team_event_detail.html (+36/-0)
loco_directory/templates/meetings/team_meeting_detail.html (+8/-0)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.889567
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+82053@code.launchpad.net

Commit message

* Added open graph to events/meetings
* Added social plugins

To post a comment you must log in.
512. By Adnane Belmadiaf

* Remove useless stuff

Revision history for this message
Chris Johnston (cjohnston) wrote :

Is the twitter button supposed to say 'Tweeter'?

review: Needs Information
513. By Adnane Belmadiaf

* Fixed Twitter button label
* Restored the admin url

514. By Adnane Belmadiaf

* Uncomment the admin url

Revision history for this message
Adnane Belmadiaf (daker) wrote :

Ok i have added some fixes.

Revision history for this message
Chris Johnston (cjohnston) wrote :

This looks good.. One more question though.. There are different spacing between each box. ie between facebook and G+ there is a big space, there is a smaller space between G+ and twitter, and then the space between Twitter and Stumble Upon is really small. Ideas? I would think they should be spaced out equally.

515. By Adnane Belmadiaf

* Fixed the space between the buttons

Revision history for this message
Adnane Belmadiaf (daker) wrote :

Ok that's all i can do.

Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'loco_directory/media/images/cof_orange_hex1.png'
2Binary files loco_directory/media/images/cof_orange_hex1.png 1970-01-01 00:00:00 +0000 and loco_directory/media/images/cof_orange_hex1.png 2011-11-14 22:03:28 +0000 differ
3=== modified file 'loco_directory/templates/events/team_event_detail.html'
4--- loco_directory/templates/events/team_event_detail.html 2011-10-05 14:30:53 +0000
5+++ loco_directory/templates/events/team_event_detail.html 2011-11-14 22:03:28 +0000
6@@ -3,6 +3,24 @@
7
8 {% block page_name %}{% trans team_event_object.name %}{% endblock %}
9
10+{% block extrahead %}{{ block.super }}
11+<meta property="fb:app_id" content="127188230723188"/>
12+<meta property="og:title" content="{{ team_event_object.name }}" />
13+{% if team_event_object.description %}
14+<meta property="og:description" content="{{ team_event_object.description|linebreaks|striptags }}" />
15+{% endif %}
16+<meta property="og:url" content="http://loco.ubuntu.com{% url team-event-detail team_event_object.first_team.lp_name team_event_object.id %}"/>
17+<meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
18+<meta property="og:site_name" content="Loco Team Portal"/>
19+<meta property="og:type" content="loco-team-portal:event"/>
20+{% if team_event_object.venue %}
21+<meta property="og:latitude" content="{{ team_event_object.venue.latitude }}"/>
22+<meta property="og:longitude" content="{{ team_event_object.venue.longitude }}"/>
23+<meta property="og:street-address" content="{{ team_event_object.venue.name }} "/>
24+<meta property="og:locality" content="{% if team_event_object.venue.city %}{{ team_event_object.venue.city }}{% endif %}"/>
25+{% endif %}
26+{% endblock %}
27+
28 {% block sub_nav_links %}
29 {% for team in team_event_object.teams.all %}<a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}
30
31@@ -21,4 +39,22 @@
32
33 {% include "events/team_event_detail.inc.html" %}
34
35+<div class="share">
36+ <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;"src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" border="0" /></a><br />
37+ <div id="fb-root"></div>
38+ <script>(function(d, s, id) {
39+ var js, fjs = d.getElementsByTagName(s)[0];
40+ if (d.getElementById(id)) {return;}
41+ js = d.createElement(s); js.id = id;
42+ js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=127188230723188";
43+ fjs.parentNode.insertBefore(js, fjs);
44+ }(document, 'script', 'facebook-jssdk'));</script>
45+ <div class="fb-like" data-href="http://loco.ubuntu.com{% url team-event-detail team_event_object.first_team.lp_name team_event_object.id %}" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
46+ <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
47+ <g:plusone size="tall"></g:plusone>
48+ <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
49+ <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
50+ <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
51+</div>
52+
53 {% endblock %}
54
55=== modified file 'loco_directory/templates/meetings/team_meeting_detail.html'
56--- loco_directory/templates/meetings/team_meeting_detail.html 2011-10-05 14:30:53 +0000
57+++ loco_directory/templates/meetings/team_meeting_detail.html 2011-11-14 22:03:28 +0000
58@@ -2,6 +2,14 @@
59 {% load i18n %}
60
61 {% block page_name %}{% trans team_meeting_object.name %}{% endblock %}
62+{% block extrahead %}{{ block.super }}
63+<meta property="fb:app_id" content="127188230723188"/>
64+<meta property="og:title" content="{{ team_meeting_object.name }}" />
65+<meta property="og:url" content="http://loco.ubuntu.com{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}"/>
66+<meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
67+<meta property="og:site_name" content="Loco Team Portal"/>
68+<meta property="og:type" content="loco-team-portal:meeting"/>
69+{% endblock %}
70
71 {% block sub_nav_links %}
72 {% for team in team_meeting_object.teams.all %}<a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}

Subscribers

People subscribed via source and target branches