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
=== added file 'loco_directory/media/images/cof_orange_hex1.png'
0Binary 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 differ0Binary 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
=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html 2011-10-05 14:30:53 +0000
+++ loco_directory/templates/events/team_event_detail.html 2011-11-14 22:03:28 +0000
@@ -3,6 +3,24 @@
33
4{% block page_name %}{% trans team_event_object.name %}{% endblock %}4{% block page_name %}{% trans team_event_object.name %}{% endblock %}
55
6{% block extrahead %}{{ block.super }}
7<meta property="fb:app_id" content="127188230723188"/>
8<meta property="og:title" content="{{ team_event_object.name }}" />
9{% if team_event_object.description %}
10<meta property="og:description" content="{{ team_event_object.description|linebreaks|striptags }}" />
11{% endif %}
12<meta property="og:url" content="http://loco.ubuntu.com{% url team-event-detail team_event_object.first_team.lp_name team_event_object.id %}"/>
13<meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
14<meta property="og:site_name" content="Loco Team Portal"/>
15<meta property="og:type" content="loco-team-portal:event"/>
16{% if team_event_object.venue %}
17<meta property="og:latitude" content="{{ team_event_object.venue.latitude }}"/>
18<meta property="og:longitude" content="{{ team_event_object.venue.longitude }}"/>
19<meta property="og:street-address" content="{{ team_event_object.venue.name }} "/>
20<meta property="og:locality" content="{% if team_event_object.venue.city %}{{ team_event_object.venue.city }}{% endif %}"/>
21{% endif %}
22{% endblock %}
23
6{% block sub_nav_links %}24{% block sub_nav_links %}
7{% for team in team_event_object.teams.all %}<a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}25{% for team in team_event_object.teams.all %}<a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}
826
@@ -21,4 +39,22 @@
2139
22{% include "events/team_event_detail.inc.html" %}40{% include "events/team_event_detail.inc.html" %}
2341
42<div class="share">
43 <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 />
44 <div id="fb-root"></div>
45 <script>(function(d, s, id) {
46 var js, fjs = d.getElementsByTagName(s)[0];
47 if (d.getElementById(id)) {return;}
48 js = d.createElement(s); js.id = id;
49 js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=127188230723188";
50 fjs.parentNode.insertBefore(js, fjs);
51 }(document, 'script', 'facebook-jssdk'));</script>
52 <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>
53 <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
54 <g:plusone size="tall"></g:plusone>
55 <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
56 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
57 <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
58</div>
59
24{% endblock %}60{% endblock %}
2561
=== modified file 'loco_directory/templates/meetings/team_meeting_detail.html'
--- loco_directory/templates/meetings/team_meeting_detail.html 2011-10-05 14:30:53 +0000
+++ loco_directory/templates/meetings/team_meeting_detail.html 2011-11-14 22:03:28 +0000
@@ -2,6 +2,14 @@
2{% load i18n %}2{% load i18n %}
33
4{% block page_name %}{% trans team_meeting_object.name %}{% endblock %}4{% block page_name %}{% trans team_meeting_object.name %}{% endblock %}
5{% block extrahead %}{{ block.super }}
6<meta property="fb:app_id" content="127188230723188"/>
7<meta property="og:title" content="{{ team_meeting_object.name }}" />
8<meta property="og:url" content="http://loco.ubuntu.com{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}"/>
9<meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
10<meta property="og:site_name" content="Loco Team Portal"/>
11<meta property="og:type" content="loco-team-portal:meeting"/>
12{% endblock %}
513
6{% block sub_nav_links %}14{% block sub_nav_links %}
7{% for team in team_meeting_object.teams.all %}<a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}15{% 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