Merge lp:~cjohnston/loco-team-portal/1019665 into lp:loco-team-portal

[Chris Johnston]

Moves social stuff above comments, fixes links that appear when not logged in

=== modified file 'loco_directory/templates/events/team_event_comment_new.inc.html'
--- loco_directory/templates/events/team_event_comment_new.inc.html	2012-06-30 19:58:08 +0000
+++ loco_directory/templates/events/team_event_comment_new.inc.html	2012-06-30 23:43:17 +0000
@@ -18,7 +18,7 @@
 
 <div class="row">
     <section class="span-8">
-        {% blocktrans with team_event_object.get_absolute_url as login_next %}To post your comment you need to <a href="openid/login/?next={{ login_next }}">login</a> or <a href="openid/login/?next={{ login_next }}">create</a> a new account{% endblocktrans %}
+        {% blocktrans with team_event_object.get_absolute_url as login_next %}To post your comment you need to <a href="/openid/login?next={{login_next}}">login</a> or <a href="/openid/login/?next={{ login_next }}">create</a> a new account{% endblocktrans %}
     </section>
 </div>
-{% endif %}
\ No newline at end of file
+{% endif %}

=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html	2012-06-30 19:41:40 +0000
+++ loco_directory/templates/events/team_event_detail.html	2012-06-30 23:43:17 +0000
@@ -48,22 +48,4 @@
 
 {% include "events/team_event_detail.inc.html" %}
 
-<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=127188230723188";
-      fjs.parentNode.insertBefore(js, fjs);
-    }(document, 'script', 'facebook-jssdk'));</script>
-    <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>
-    <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>
-
 {% endblock %}

=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
--- loco_directory/templates/events/team_event_detail.inc.html	2012-06-30 19:19:08 +0000
+++ loco_directory/templates/events/team_event_detail.inc.html	2012-06-30 23:43:17 +0000
@@ -11,6 +11,23 @@
         {% endif %}
         <h3>{% trans "Details" %}</h3>
         {% include "events/team_event_detail_basic.inc.html" %}
+        <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=127188230723188";
+      fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));</script>
+    <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>
+    <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>
     </section>
     <section class="span-6 last">
         <h3>