5 files changed, 33 insertions, 4 deletions
diff --git a/chimere/static/icons/facebook.png b/chimere/static/icons/facebook.png
new file mode 100644
index 0000000..8036b19
--- /dev/null
+++ b/chimere/static/icons/facebook.png
diff --git a/chimere/static/icons/identica.png b/chimere/static/icons/identica.png
new file mode 100644
index 0000000..a9625d1
--- /dev/null
+++ b/chimere/static/icons/identica.png
diff --git a/chimere/static/icons/twitter.png b/chimere/static/icons/twitter.png
new file mode 100644
index 0000000..295767a
--- /dev/null
+++ b/chimere/static/icons/twitter.png
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);
     }
 }
 
diff --git a/chimere/static/styles.css b/chimere/static/styles.css
index 8094bba..e6618b8 100644
--- a/chimere/static/styles.css
+++ b/chimere/static/styles.css
@@ -232,6 +232,28 @@ height:90%;
 width:280px;
 }
 
+ul#share{
+list-style-type:none;
+margin:0;
+padding:0;
+}
+
+ul#share li{
+display:inline;
+line-height:22px;
+vertical-align: bottom;
+}
+
+#share a{
+text-decoration:None;
+}
+
+#share img{
+border:None;
+width:22px;
+height:22px;
+}
+
 #welcome h2{
 padding:10px 0;
 }