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

[Chris Johnston]

Starts adding social media to summit by adding opengraph

[lp:~cjohnston/summit/open-graph]

255. By Chris Johnston on 2012-01-22

Fixes meeting page.

256. By Chris Johnston on 2012-01-22

Adds cof and updates links

[Michael Hall (mhall119)]

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

review: Approve

=== 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 @@
 a.launchpad img {
    border: 0;
 }
+
+.double-side-content {
+    float: left;
+    margin: 5px 10px;
+    padding: 10px;
+    width: 600px;
+}
+
+.summit-columns { -webkit-box-shadow: 0px 1px 1px #CCC; -moz-box-shadow:0 1px 1px #CCC; }
+.summit-columns { clear: both; background-color: #F7F7F7; padding: 5px; margin-bottom: -3px; }
+.summit-columns h2 { color: #444; font-weight: normal; border-bottom: 1px solid #EDEDED; text-indent: 10px; margin-bottom: 0; }
+.summit-columns ul { list-style: none; margin: 0; border-top: 1px solid #FFF; }
+.summit-columns ul li { width: 23%; float: left; padding-left: 10px; }
+.summit-columns ul li h3,
+.summit-columns ul li h3 a { color: #DD4814; text-decoration: none; margin-bottom: 0; margin-top: 5px; }
+.summit-columns ul li h3 a:hover { text-decoration: underline; }
+.summit-columns ul li img { padding: 10px 0 5px; }
+.summit-columns p { margin-bottom: 5px; }

=== added file 'summit/media/images/cof_orange_hex1.png'
Binary 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 @@
 {% load datetime %}
 
 {% block title %}
-    {{ meeting.title }} - 
-    {% if schedule.date %}{{ schedule.date|strftime:"%Y-%m-%d" }}{% endif %}
+    {{ meeting.title }}
+    {% if schedule.date %} - {{ schedule.date|strftime:"%Y-%m-%d" }}{% endif %}
     {% if schedule.room %}{{ schedule.room.title }}{% endif %}
 {% endblock %}
 
+{% block extrahead %}{{ block.super }}
+<meta property="fb:app_id" content="310260202349342" />
+<meta property="og:title" content="{{ meeting.title }}{% if schedule.date %} - {{ schedule.date|strftime:"%Y-%m-%d" }}{% endif %}{% if schedule.room %}{{ schedule.room.title }}{% endif %}" />
+{% if meeting.description %}
+<meta property="og:description" content="{{ meeting.description|linebreaks|striptags }}" />
+{% endif %}
+<meta property="og:url" content="http://summit.ubuntu.com{% url schedule.views.meeting meeting.summit.name, meeting.id, meeting.name %}" />
+<meta property="og:image" content="http://summit.ubuntu.com/media/images/cof_orange_hex1.png" />
+<meta property="og:site_name" content="The Summit Scheduler" />
+<meta property="og:type" content="article" />
+<meta itemprop="name" content="{{ meeting.title }}{% if schedule.date %} - {{ schedule.date|strftime:"%Y-%m-%d" }}{% endif %}{% if schedule.room %}{{ schedule.room.title }}{% endif %}" />
+<meta itemprop="description" content="{{ meeting.description|linebreaks|striptags }}" />
+{% endblock %}
+
 {% block sub_nav_links %}
     {% if meeting.private %}
     {% if meeting.private_key and meeting.private_key != '' %}
@@ -29,19 +43,39 @@
 {% endblock %}
 
 {% block content %}
-
-<article class="main-content">
-
-        <h2>{{ meeting.title }}</h2>
-
-        {% for ai in agenda_items %}
-            <h3>{{ ai.slot }} in {{ ai.room.name }}</h3>
-        {% endfor %}
-
+<section class="double-side-content">
+    <h2>{{ meeting.title }}</h2>
+    {% for ai in agenda_items %}
+        <h3>{{ ai.slot }} in {{ ai.room.name }}</h3>
+    {% endfor %}
     <div id="description">
         {{ meeting.description }}
     </div>
 
+</section>
+{% if meeting.private %}
+{% else %}
+<article class="side-content alone">
+<div class="share">
+    <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 />
+    <div id="fb-root"></div>
+    <script>(function(d, s, id) {
+        var js, fjs = d.getElementsByTagName(s)[0];
+        if (d.getElementById(id)) {return;}
+        js = d.createElement(s); js.id = id;
+        js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=310260202349342";
+        fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));</script>
+    <div class="fb-like" data-href="" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
+    <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+    <g:plusone size="tall"></g:plusone>
+    <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
+    <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+    <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
+</div>
+</article>
+{% endif %}
+
     {% if meeting.private %}
     <h3>WARNING: Contents of this pad may not be private, and may be searcheable by non-attendees!</h3>
     {% endif %}

=== 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 @@
 
 {% block title %}{{ summit.title }}{% endblock %}
 
+{% block extrahead %}{{ block.super }}
+<meta property="fb:app_id" content="310260202349342" />
+<meta property="og:title" content="{{ summit.title }} {{ summit.start|strftime:"%d" }} - {{ summit.end|strftime:"%d, %b. %Y" }}" />
+{% if summit.description %}
+<meta property="og:description" content="{{ summit.description|safe }}" />
+{% endif %}
+<meta property="og:url" content="http://summit.ubuntu.com{% url schedule.views.summit summit.name %}" />
+<meta property="og:image" content="http://summit.ubuntu.com/media/images/cof_orange_hex1.png"/>
+<meta property="og:site_name" content="The Summit Scheduler"/>
+<meta property="og:type" content="summit-scheduler:meeting"/>
+<meta itemprop="name" content="{{ summit.title }} {{ summit.start|strftime:"%d" }} - {{ summit.end|strftime:"%d, %b. %Y" }}" />
+<meta itemprop="description" content="{{ summit.description|linebreaks|striptags }}" />
+{% endblock %}
+
 {% block sub_nav_links %}
 
 {% ifequal summit.state "sponsor" %}
@@ -31,36 +45,57 @@
 
 {% block content %}
 
-<article class="main-content">
-<h1>{{ summit.title }}</h1>
-<p>
-{% include "schedule/summit_info.html" %}
-</p>
-</article>
-
-<article class="main-content">
-{% if attendee %}
-<p>You are attending, you can update the days and times of your attendance in
-<a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.</p>
-<p>Download your 
-<a href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">Participation Schedule</a> to import into your Calendar.
-</p>
-{% else %}
-{% if request.user.is_authenticated %}
-<p><strong>You are not registered as attending.</strong></p>
-<p>You can register your attendance in
-<a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
-If you have recently done so, wait a few minutes and reload this page.</p>
-{% else %}
-<p><strong>You are not logged in.</strong></p>
-<p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
-{% endif %}
-{% endif %}
-</article>
-
-<article class="main-content">
-<p>
-{% include "schedule/schedule_list.html" %}
-</p>
+<section class="double-side-content">
+    <h1>{{ summit.title }}</h1>
+    <p>
+        {% include "schedule/summit_info.html" %}
+    </p>
+</section>
+<article class="side-content alone">
+    <div class="share">
+        <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 />
+        <div id="fb-root"></div>
+        <script>(function(d, s, id) {
+            var js, fjs = d.getElementsByTagName(s)[0];
+            if (d.getElementById(id)) {return;}
+            js = d.createElement(s); js.id = id;
+            js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=310260202349342";
+            fjs.parentNode.insertBefore(js, fjs);
+        }(document, 'script', 'facebook-jssdk'));</script>
+        <div class="fb-like" data-href="" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
+        <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+        <g:plusone size="tall"></g:plusone>
+        <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
+        <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+        <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
+    </div>
+</article>
+
+<article class="main-content">
+    {% if attendee %}
+        <p>You are attending, you can update the days and times of your attendance in
+            <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
+        </p>
+        <p>Download your 
+            <a href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">Participation Schedule</a> to import into your Calendar.
+        </p>
+    {% else %}
+        {% if request.user.is_authenticated %}
+            <p><strong>You are not registered as attending.</strong></p>
+            <p>You can register your attendance in
+                <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
+                If you have recently done so, wait a few minutes and reload this page.
+            </p>
+        {% else %}
+            <p><strong>You are not logged in.</strong></p>
+            <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
+        {% endif %}
+    {% endif %}
+</article>
+
+<article class="main-content">
+    <p>
+        {% include "schedule/schedule_list.html" %}
+    </p>
 </article>
 {% endblock %}