diff options
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 1 | ||||
| -rw-r--r-- | chimere/static/chimere/img/share-icon.png | bin | 2148 -> 1208 bytes | |||
| -rw-r--r-- | chimere/static/chimere/js/base.js | 33 | ||||
| -rw-r--r-- | chimere/templates/chimere/blocks/head_chimere.html | 1 | ||||
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 2 | ||||
| -rw-r--r-- | chimere/views.py | 1 |
6 files changed, 37 insertions, 1 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 001fa7b..f3af02b 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -329,6 +329,7 @@ ul.share{ list-style-type:none; margin:0; padding:0; + display:inline; } ul.share li{ diff --git a/chimere/static/chimere/img/share-icon.png b/chimere/static/chimere/img/share-icon.png Binary files differindex 89b631c..f21b76e 100644 --- a/chimere/static/chimere/img/share-icon.png +++ b/chimere/static/chimere/img/share-icon.png diff --git a/chimere/static/chimere/js/base.js b/chimere/static/chimere/js/base.js index 3f9d39d..4482879 100644 --- a/chimere/static/chimere/js/base.js +++ b/chimere/static/chimere/js/base.js @@ -107,3 +107,36 @@ function zoomToCurrentExtent(map){ map.zoomToExtent(extent, true); return true; } + +/* interface */ +function share_link_update(){ + $('.share_link').click(function(){ + if (this.share_initialized){ + return false; + } + this.share_initialized = true; + var href = $(this).attr('href'); + var url = get_share_url; + var classes = $(this).attr('class').split(' '); + prefix = 'share_id_'; + var share_id; + for (idx=0;idx<classes.length;idx++){ + if(classes[idx].substring(0, prefix.length) == prefix){ + var share_id = classes[idx].substring(prefix.length); + } + } + var params = $('#permalink a').attr('href').split('/'); + url += share_id + params[params.length-1]; + $.ajax({url: url, + dataType: "html", + success: function (url) { + window.open(url); + return false; + }, + error: function(){ + return false; + } + }); + return false; + }); +} diff --git a/chimere/templates/chimere/blocks/head_chimere.html b/chimere/templates/chimere/blocks/head_chimere.html index 549c131..29a1be4 100644 --- a/chimere/templates/chimere/blocks/head_chimere.html +++ b/chimere/templates/chimere/blocks/head_chimere.html @@ -24,6 +24,7 @@ var area_name = '{{ area_name }}';{% endif %} $(function() {$( ".draggable" ).draggable({handle:"h2"});}); + var get_share_url = '{% url chimere:get-share-url %}'; </script> <style> .olControlPanPanel div { diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index 35861e1..f2221b2 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -150,6 +150,7 @@ def map_menu(context): def routing(context): context_data = {'routing':settings.CHIMERE_ENABLE_ROUTING, 'itinerary_form':context['itinerary_form']} + context_data['STATIC_URL'] = settings.STATIC_URL return context_data @register.inclusion_tag('chimere/blocks/map_params.html', takes_context=True) @@ -254,6 +255,7 @@ def get_tinyfied_url(marker, area_name=''): @register.inclusion_tag('chimere/blocks/share_bar.html', takes_context=True) def share_bar(context, name=''): + context['STATIC_URL'] = settings.STATIC_URL context['name'] = name context['share_networks'] = [(defaultfilters.slugify(name), url, icon) for name, url, icon in settings.CHIMERE_SHARE_NETWORKS] diff --git a/chimere/views.py b/chimere/views.py index 278ae22..fd8f927 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -109,7 +109,6 @@ def getShareUrl(request, area_name='', network=''): Get a share url """ data = getTinyfiedUrl(request, request.GET.urlencode(), area_name) - print data for name, url, img in settings.CHIMERE_SHARE_NETWORKS: if defaultfilters.slugify(name) == network: return HttpResponse(url % {'text':data['text'], 'url':data['url']}) |
