Clearer sharing for comments - closes #362, closes #363

mysociety · Mar 15, 2012 · ed2140b · ed2140b
1 parent ed67096
commit ed2140b
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 18 deletions.
diff --git a/mzalendo/comments2/templates/comments/list.html b/mzalendo/comments2/templates/comments/list.html
@@ -7,7 +7,7 @@
                     <h4>{{ comment.title }}</h4>
                     <p class="meta">by {% firstof comment.user.get_full_name comment.user.username %} <time datetime="{{ comment.submit_date }}">{{ comment.submit_date|timesince }}</time> ago</p>
                     <ul class="tools">
-                        <li><a href="#" class="like">like</a></li>
+                        <li><a href="{{ comment.get_absolute_url }}" class="like">share</a></li>
                         <li><a href="/comments/flag/{{ comment.id }}/" class="report">report</a></li>
                         <li><a href="{{ comment.get_absolute_url }}">link</a></li>
                     </ul>

diff --git a/mzalendo/comments2/templates/comments/view.html b/mzalendo/comments2/templates/comments/view.html
@@ -7,6 +7,20 @@
 
 {% block content %}
 
+    <ul class="social-buttons" style="float: right;">
+        <li>
+            <a                
+                href="https://twitter.com/share"
+                class="twitter-share-button"
+                data-text="Good comment on {{ comment.content_object.name }}: {{ comment.title }}"
+                data-count="vertical"
+            >Tweet</a>
+        </li>
+        <li>
+            <div class="fb-like" data-send="false" data-layout="box_count"></div>
+        </li>
+    </ul>
+
     {% if comment_rejected %}
         <h1>Comment has been removed</h1>
 
@@ -38,18 +52,6 @@ <h1>Comment on <a href="{{ comment.content_object.get_absolute_url }}">{{ commen
             <a class="permalink" href="{{ comment.get_absolute_url }}">permalink</a>
         </p>
 
-        <p>
-            Share this comment with others:
-            <a                
-                href="https://twitter.com/share"
-                class="twitter-share-button"
-                data-text="Good comment on {{ comment.content_object.name }}: {{ comment.title }}"
-                data-count="none"
-            >Tweet your comment</a>
-
-            <span class="fb-send" data-href="http://{{ request.get_host }}{{ comment.get_absolute_url }}"></span>
-        </p>
-
     {% endif %}
 
 {% endblock %}
diff --git a/mzalendo/core/static/css/all.css b/mzalendo/core/static/css/all.css
@@ -1554,8 +1554,6 @@ menu#site-user-tools ul li.active a:hover {
   #page .page-wrapper {
     clear: both;
     display: block;
-    overflow: hidden;
-    position: relative;
   }
   #page .title-space {
     max-width: 510px;
@@ -3476,3 +3474,18 @@ h2 a.appearances-trigger.active {
     margin: 0;
   }
 }
+ul.social-buttons {
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
+}
+ul.social-buttons li {
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+ul.social-buttons li {
+  float: left;
+  padding: 4px;
+}
diff --git a/mzalendo/core/static/js/loader.js b/mzalendo/core/static/js/loader.js
@@ -39,6 +39,7 @@
             both: [
                 static_url('js/analytics.js'),
                 '//platform.twitter.com/widgets.js',
+                '//connect.facebook.net/en_GB/all.js#xfbml=1&appId=' + mzalendo_settings.facebook_app_id,
                 '//www.google.com/jsapi' // ?key=INSERT-YOUR-KEY
             ].concat( extra_js ),
             complete: function () {
@@ -48,7 +49,6 @@
             }
         }
     );
-
 })();
 
 var mzalendo_run_when_document_ready_array = [];

diff --git a/mzalendo/core/static/sass/_page.scss b/mzalendo/core/static/sass/_page.scss
@@ -228,8 +228,9 @@
     .page-wrapper {
       clear: both;
       display: block;
-      overflow: hidden;
+      //      overflow: hidden;
-      position: relative; }
+      //      position: relative;
+    }
     .title-space {
       max-width: 510px;
       min-height: 0;

diff --git a/mzalendo/core/static/sass/_social.scss b/mzalendo/core/static/sass/_social.scss
@@ -0,0 +1,5 @@
+ul.social-buttons {
+  @include list-reset-soft;
+  li {
+    float: left; 
+    padding: 4px;} }
diff --git a/mzalendo/core/static/sass/all.scss b/mzalendo/core/static/sass/all.scss
@@ -29,3 +29,6 @@
 @import "auth_pages";
 @import "appearances";
 @import "info_pages";
+
+// overides to external features
+@import "social";
diff --git a/mzalendo/templates/base.html b/mzalendo/templates/base.html
@@ -119,6 +119,8 @@
             <div class="page-wrapper wrapper">
                 {% block content %}{% endblock %}
                 {% block after_content %}{% endblock %}
+
+                <br clear="both">
             </div>
         </div>