1 files changed, 11 insertions, 4 deletions
diff --git a/chimere/static/main_map.js b/chimere/static/main_map.js
index 5964aea..66ed27f 100644
--- a/chimere/static/main_map.js
+++ b/chimere/static/main_map.js
@@ -390,6 +390,7 @@ var refreshMapItems = function (evt) {
 /* update current detail panel with an AJAX request */
 function updateDetail(pk){
     var uri = extra_url + "getDetail/" + pk;
+    if (simple){uri += "/?simple=True"}
     OpenLayers.loadURL(uri, '', this, setDetail);
 }
 
@@ -470,10 +471,14 @@ function createParams(center, zoom, layers) {
 var tiny_url = '';
 var redirect_url = '';
 
-function processTinyUrl(url){
-    var params = OpenLayers.Util.getParameterString(this.createParams());
+function processTinyUrl(url, current_feature_id){
     redirect_url = url;
-    var uri = extra_url + "getTinyUrl/" + params;
+    var uri = extra_url + "getTinyUrl/";
+    var params = OpenLayers.Util.getParameterString(this.createParams());
+    if (current_feature_id && params.indexOf('current_feature') < 0){
+        uri += 'current_feature=' + current_feature_id + '&';
+    }
+    uri += params;
     OpenLayers.loadURL(uri, '', this, getTinyfiedUrl);
 }
 
@@ -485,7 +490,9 @@ function getTinyfiedUrl(response){
         var result = json.read(response.responseText);
         tiny_url = result.url;
         if (!redirect_url || !tiny_url) return;
-        window.open(redirect_url+tiny_url);
+        redirect_url = redirect_url.replace('URL', tiny_url);
+        redirect_url = redirect_url.replace('TEXT', result.text);
+        window.open(redirect_url);
     }
 }