Changes on "Share network" - add a printer icon - fix permalink

1 files changed, 19 insertions, 9 deletions

diff --git a/chimere/views.py b/chimere/views.py
index ecaae0b..20b4bd2 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -104,6 +104,21 @@ def get_base_response(area_name=""):
     base_response_dct['JQUERY_CSS_URLS'] = settings.JQUERY_CSS_URLS
     return base_response_dct, None
 
+def getShareNetwork(request, area_name='', marker=None):
+    """
+    Get URLs to share items
+    """
+    parameters = ""
+    if marker:
+        parameters = u'current_feature=%d' % marker.pk
+        parameters += u"&checked_categories=%s" % "_".join([str(m.id) \
+                                              for m in marker.categories.all()])
+    net_dct = getTinyfiedUrl(request, parameters, area_name)
+    share_networks = []
+    for network in settings.CHIMERE_SHARE_NETWORKS:
+        share_networks.append((network[0], network[1] % net_dct, network[2]))
+    return share_networks, net_dct
+
 def index(request, area_name=None, default_area=None, simple=False):
     """
     Main page
@@ -116,7 +131,6 @@ def index(request, area_name=None, default_area=None, simple=False):
        request.session['last_visit'] != today:
         request.session['last_visit'] = today
         news_visible = True
-    news_visible = True
     response_dct, redir = get_base_response(area_name)
     if redir:
         return redir
@@ -138,6 +152,8 @@ def index(request, area_name=None, default_area=None, simple=False):
          'zoomout':zoomout,
          'contact_email':settings.CONTACT_EMAIL
         })
+    response_dct['share_networks'], net_dct = \
+                   getShareNetwork(request, response_dct['area_name'])
     tpl = 'chimere/main_map.html'
     if simple:
         tpl = 'chimere/main_map_simple.html'
@@ -507,15 +523,9 @@ def getDetail(request, area_name, marker_id):
     if request.method == 'GET':
         if 'simple' in request.GET and request.GET['simple']:
             response_dct['simple'] = True
-    parameters = u'current_feature=%s' % marker_id
-    parameters += u"&checked_categories=%s" % "_".join([str(m.id) \
-                                              for m in marker.categories.all()])
-    net_dct = getTinyfiedUrl(request, parameters, response_dct['area_name'])
-    share_networks = []
+    response_dct['share_networks'], net_dct = \
+                   getShareNetwork(request, response_dct['area_name'], marker)
     response_dct['share_url'] = net_dct['url']
-    for network in settings.CHIMERE_SHARE_NETWORKS:
-        share_networks.append((network[0], network[1] % net_dct, network[2]))
-    response_dct['share_networks'] = share_networks
     net_dct['to'] = ";".join(getStaffEmails())
     if net_dct['to']:
         net_dct["body"] = _(settings.CHIMERE_MODIF_EMAIL)