Summit

Merge lp:~cjohnston/summit/open-graph into lp:summit

  1. open-graph
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 256
Merged at revision: 261
Proposed branch: lp:~cjohnston/summit/open-graph
Merge into: lp:summit
Diff against target: 222 lines (+129/-42)
3 files modified
summit/media/css/style.css (+18/-0)
summit/schedule/templates/schedule/meeting.html (+45/-11)
summit/schedule/templates/schedule/summit.html (+66/-31)
To merge this branch: bzr merge lp:~cjohnston/summit/open-graph
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+89602@code.launchpad.net

Commit message

Starts adding social media to summit by adding opengraph

To post a comment you must log in.
lp:~cjohnston/summit/open-graph updated
255. By Chris Johnston

Fixes meeting page.

256. By Chris Johnston

Adds cof and updates links

Revision history for this message
Michael Hall (mhall119) wrote :

Looks good. Has a minor conflict with trunk, so I'm going to land it manually with the fix

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'summit/media/css/style.css'
--- summit/media/css/style.css 2010-10-05 13:21:41 +0000
+++ summit/media/css/style.css 2012-01-22 18:53:23 +0000
@@ -48,3 +48,21 @@
48a.launchpad img {48a.launchpad img {
49 border: 0;49 border: 0;
50}50}
51
52.double-side-content {
53 float: left;
54 margin: 5px 10px;
55 padding: 10px;
56 width: 600px;
57}
58
59.summit-columns { -webkit-box-shadow: 0px 1px 1px #CCC; -moz-box-shadow:0 1px 1px #CCC; }
60.summit-columns { clear: both; background-color: #F7F7F7; padding: 5px; margin-bottom: -3px; }
61.summit-columns h2 { color: #444; font-weight: normal; border-bottom: 1px solid #EDEDED; text-indent: 10px; margin-bottom: 0; }
62.summit-columns ul { list-style: none; margin: 0; border-top: 1px solid #FFF; }
63.summit-columns ul li { width: 23%; float: left; padding-left: 10px; }
64.summit-columns ul li h3,
65.summit-columns ul li h3 a { color: #DD4814; text-decoration: none; margin-bottom: 0; margin-top: 5px; }
66.summit-columns ul li h3 a:hover { text-decoration: underline; }
67.summit-columns ul li img { padding: 10px 0 5px; }
68.summit-columns p { margin-bottom: 5px; }
5169
=== added file 'summit/media/images/cof_orange_hex1.png'
52Binary files summit/media/images/cof_orange_hex1.png 1970-01-01 00:00:00 +0000 and summit/media/images/cof_orange_hex1.png 2012-01-22 18:53:23 +0000 differ70Binary files summit/media/images/cof_orange_hex1.png 1970-01-01 00:00:00 +0000 and summit/media/images/cof_orange_hex1.png 2012-01-22 18:53:23 +0000 differ
=== modified file 'summit/schedule/templates/schedule/meeting.html'
--- summit/schedule/templates/schedule/meeting.html 2012-01-20 22:30:57 +0000
+++ summit/schedule/templates/schedule/meeting.html 2012-01-22 18:53:23 +0000
@@ -2,11 +2,25 @@
2{% load datetime %}2{% load datetime %}
33
4{% block title %}4{% block title %}
5 {{ meeting.title }} - 5 {{ meeting.title }}
6 {% if schedule.date %}{{ schedule.date|strftime:"%Y-%m-%d" }}{% endif %}6 {% if schedule.date %} - {{ schedule.date|strftime:"%Y-%m-%d" }}{% endif %}
7 {% if schedule.room %}{{ schedule.room.title }}{% endif %}7 {% if schedule.room %}{{ schedule.room.title }}{% endif %}
8{% endblock %}8{% endblock %}
99
10{% block extrahead %}{{ block.super }}
11<meta property="fb:app_id" content="310260202349342" />
12<meta property="og:title" content="{{ meeting.title }}{% if schedule.date %} - {{ schedule.date|strftime:"%Y-%m-%d" }}{% endif %}{% if schedule.room %}{{ schedule.room.title }}{% endif %}" />
13{% if meeting.description %}
14<meta property="og:description" content="{{ meeting.description|linebreaks|striptags }}" />
15{% endif %}
16<meta property="og:url" content="http://summit.ubuntu.com{% url schedule.views.meeting meeting.summit.name, meeting.id, meeting.name %}" />
17<meta property="og:image" content="http://summit.ubuntu.com/media/images/cof_orange_hex1.png" />
18<meta property="og:site_name" content="The Summit Scheduler" />
19<meta property="og:type" content="article" />
20<meta itemprop="name" content="{{ meeting.title }}{% if schedule.date %} - {{ schedule.date|strftime:"%Y-%m-%d" }}{% endif %}{% if schedule.room %}{{ schedule.room.title }}{% endif %}" />
21<meta itemprop="description" content="{{ meeting.description|linebreaks|striptags }}" />
22{% endblock %}
23
10{% block sub_nav_links %}24{% block sub_nav_links %}
11 {% if meeting.private %}25 {% if meeting.private %}
12 {% if meeting.private_key and meeting.private_key != '' %}26 {% if meeting.private_key and meeting.private_key != '' %}
@@ -29,19 +43,39 @@
29{% endblock %}43{% endblock %}
3044
31{% block content %}45{% block content %}
3246<section class="double-side-content">
33<article class="main-content">47 <h2>{{ meeting.title }}</h2>
3448 {% for ai in agenda_items %}
35 <h2>{{ meeting.title }}</h2>49 <h3>{{ ai.slot }} in {{ ai.room.name }}</h3>
3650 {% endfor %}
37 {% for ai in agenda_items %}
38 <h3>{{ ai.slot }} in {{ ai.room.name }}</h3>
39 {% endfor %}
40
41 <div id="description">51 <div id="description">
42 {{ meeting.description }}52 {{ meeting.description }}
43 </div>53 </div>
4454
55</section>
56{% if meeting.private %}
57{% else %}
58<article class="side-content alone">
59<div class="share">
60 <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 />
61 <div id="fb-root"></div>
62 <script>(function(d, s, id) {
63 var js, fjs = d.getElementsByTagName(s)[0];
64 if (d.getElementById(id)) {return;}
65 js = d.createElement(s); js.id = id;
66 js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=310260202349342";
67 fjs.parentNode.insertBefore(js, fjs);
68 }(document, 'script', 'facebook-jssdk'));</script>
69 <div class="fb-like" data-href="" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
70 <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
71 <g:plusone size="tall"></g:plusone>
72 <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
73 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
74 <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
75</div>
76</article>
77{% endif %}
78
45 {% if meeting.private %}79 {% if meeting.private %}
46 <h3>WARNING: Contents of this pad may not be private, and may be searcheable by non-attendees!</h3>80 <h3>WARNING: Contents of this pad may not be private, and may be searcheable by non-attendees!</h3>
47 {% endif %}81 {% endif %}
4882
=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html 2012-01-19 21:26:08 +0000
+++ summit/schedule/templates/schedule/summit.html 2012-01-22 18:53:23 +0000
@@ -4,6 +4,20 @@
44
5{% block title %}{{ summit.title }}{% endblock %}5{% block title %}{{ summit.title }}{% endblock %}
66
7{% block extrahead %}{{ block.super }}
8<meta property="fb:app_id" content="310260202349342" />
9<meta property="og:title" content="{{ summit.title }} {{ summit.start|strftime:"%d" }} - {{ summit.end|strftime:"%d, %b. %Y" }}" />
10{% if summit.description %}
11<meta property="og:description" content="{{ summit.description|safe }}" />
12{% endif %}
13<meta property="og:url" content="http://summit.ubuntu.com{% url schedule.views.summit summit.name %}" />
14<meta property="og:image" content="http://summit.ubuntu.com/media/images/cof_orange_hex1.png"/>
15<meta property="og:site_name" content="The Summit Scheduler"/>
16<meta property="og:type" content="summit-scheduler:meeting"/>
17<meta itemprop="name" content="{{ summit.title }} {{ summit.start|strftime:"%d" }} - {{ summit.end|strftime:"%d, %b. %Y" }}" />
18<meta itemprop="description" content="{{ summit.description|linebreaks|striptags }}" />
19{% endblock %}
20
7{% block sub_nav_links %}21{% block sub_nav_links %}
822
9{% ifequal summit.state "sponsor" %}23{% ifequal summit.state "sponsor" %}
@@ -31,36 +45,57 @@
3145
32{% block content %}46{% block content %}
3347
34<article class="main-content">48<section class="double-side-content">
35<h1>{{ summit.title }}</h1>49 <h1>{{ summit.title }}</h1>
36<p>50 <p>
37{% include "schedule/summit_info.html" %}51 {% include "schedule/summit_info.html" %}
38</p>52 </p>
39</article>53</section>
4054<article class="side-content alone">
41<article class="main-content">55 <div class="share">
42{% if attendee %}56 <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 />
43<p>You are attending, you can update the days and times of your attendance in57 <div id="fb-root"></div>
44<a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.</p>58 <script>(function(d, s, id) {
45<p>Download your 59 var js, fjs = d.getElementsByTagName(s)[0];
46<a href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">Participation Schedule</a> to import into your Calendar.60 if (d.getElementById(id)) {return;}
47</p>61 js = d.createElement(s); js.id = id;
48{% else %}62 js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=310260202349342";
49{% if request.user.is_authenticated %}63 fjs.parentNode.insertBefore(js, fjs);
50<p><strong>You are not registered as attending.</strong></p>64 }(document, 'script', 'facebook-jssdk'));</script>
51<p>You can register your attendance in65 <div class="fb-like" data-href="" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
52<a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.66 <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
53If you have recently done so, wait a few minutes and reload this page.</p>67 <g:plusone size="tall"></g:plusone>
54{% else %}68 <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
55<p><strong>You are not logged in.</strong></p>69 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
56<p><a href="/openid/login?next={{login_next}}">Log in now</a></p>70 <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
57{% endif %}71 </div>
58{% endif %}72</article>
59</article>73
6074<article class="main-content">
61<article class="main-content">75 {% if attendee %}
62<p>76 <p>You are attending, you can update the days and times of your attendance in
63{% include "schedule/schedule_list.html" %}77 <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
64</p>78 </p>
79 <p>Download your
80 <a href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">Participation Schedule</a> to import into your Calendar.
81 </p>
82 {% else %}
83 {% if request.user.is_authenticated %}
84 <p><strong>You are not registered as attending.</strong></p>
85 <p>You can register your attendance in
86 <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
87 If you have recently done so, wait a few minutes and reload this page.
88 </p>
89 {% else %}
90 <p><strong>You are not logged in.</strong></p>
91 <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
92 {% endif %}
93 {% endif %}
94</article>
95
96<article class="main-content">
97 <p>
98 {% include "schedule/schedule_list.html" %}
99 </p>
65</article>100</article>
66{% endblock %}101{% endblock %}

Subscribers

People subscribed via source and target branches