Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:mpasalic/verifyy

  • Loading branch information...
commit 03b53a3115b2a23fc894c9ae20aab72143a8307a 2 parents c911824 + 2d591bb
Jason Jackson authored
Showing with 19 additions and 1 deletion.
  1. +1 −1  main/views.py
  2. +18 −0 templates/experiment.html
View
2  main/views.py
@@ -21,7 +21,7 @@
from django.db.models import Avg, Max, Min, Count, Q
import urllib2
import re
-import fb
+#import fb
def authCheck(request):
authed = not isinstance(request.user,AnonymousUser)
View
18 templates/experiment.html
@@ -939,6 +939,13 @@
</div>
</div>
+ <div id="addthis" style="float: right; width: 72px">
+ <a name="fb_share" type="icon"></a>
+ <span style="position: relative; top: 2px">
+ <g:plusone size="small" annotation="none"></g:plusone>
+ </span>
+ </div>
+
<div class="box_header">experiment</div>
<div class="rounded_small_box experiment_box centered_box" style="width: 650px;">
@@ -1105,5 +1112,16 @@
</div>
</div>
+<script src="http://static.ak.fbcdn.net/connect.php/js/FB.Share"
+ type="text/javascript">
+</script>
+<script type="text/javascript">
+ (function() {
+ var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+ po.src = 'https://apis.google.com/js/plusone.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+ })();
+</script>
+
{% endblock %}
Please sign in to comment.
Something went wrong with that request. Please try again.