Merge branch 'master' into saclay

3 files changed, 4 insertions, 15 deletions

diff --git a/manage.py b/manage.py
index 7bbd479..abb366f 100755
--- a/manage.py
+++ b/manage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import os, sys
 from django.core.management import execute_manager
 sys.path.insert(0, '/home/nim/Work/chimere-project/chimere/')
diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js
index 8c7eb6b..3c0ae1d 100644
--- a/static/saclay/js/interface.js
+++ b/static/saclay/js/interface.js
@@ -145,11 +145,6 @@ $(function(){
         return false;
     });
 
-    $('.share-icon').click(function(){
-        $(this).hide();
-        $(this).nextAll('.shared').show();
-        return false;
-    });
     $('.print-page').click(function(){
         window.print();
         return false;
@@ -222,11 +217,6 @@ function display_feature_detail(data, settings){
         $("#read_less_"+settings.current_feature.pk).hide();
         $("#read_more_"+settings.current_feature.pk).show();
     });
-    $('.share-icon').click(function(){
-        $(this).hide();
-        $(this).parent().nextAll('.shared').show();
-        return false;
-    });
     $(document).ready(function(){
         share_link_update();
         $("a[rel^='prettyPhoto']").prettyPhoto({
diff --git a/templates/chimere/blocks/share_bar.html b/templates/chimere/blocks/share_bar.html
index 73177fc..aaa9fc4 100644
--- a/templates/chimere/blocks/share_bar.html
+++ b/templates/chimere/blocks/share_bar.html
@@ -4,12 +4,11 @@
     <a href='{{share_network.1}}'>{{share_network.0}}</a>
     {% endfor %}{%else%}
     <ul class='share'>
-        <li class='share-send'><a class='share_link share_id_{{share_networks.0.0}}{% if email_only %}_single{%endif%}' href='{{share_networks.0.1}}'>{% trans "Email" %}</a></li>
+        <li class='share-send'><a class='share_link share_id_{{share_networks.0.0}}{% if email_only %}_single{%endif%}' href='{{share_networks.0.1}}'><img src="{{share_network.0.2}}" alt="{{share_network.0.0}}"/></a></li>
         {% if not email_only %}<li class='share-icon'><a href="#">{% trans "Share" %}</a></li>{% for share_network in share_networks %}
-        {%if forloop.counter0%}
-        <li class='shared' style='display:none'><a class='share_link share_id_{{share_network.0}}' href='{{share_network.1}}'><img src="{{share_network.2}}" alt="{{share_network.0}}"/></a></li>{%endif%}
+        <li class='shared'><a class='share_link share_id_{{share_network.0}}' href='{{share_network.1}}'><img src="{{share_network.2}}" alt="{{share_network.0}}"/></a></li>
     {% endfor %}
-        <li class='shared' style='display:none'><a href='{% url chimere:feeds-global %}'><img src='{{STATIC_URL}}chimere/img/feed.png' alt='Feeds'/></a></li>{%endif%}
+        <li class='shared'><a href='{% url chimere:feeds-global %}'><img src='{{STATIC_URL}}chimere/img/feed.png' alt='Feeds'/></a></li>{%endif%}
     </ul>{% endif %}
     <script type='text/javascript'>
         <!--