From 8b473eef82deaaaee340d045e3be09263bfbc7bb Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Sun, 9 Sep 2012 12:42:37 +0200
Subject: Changes on "Share network" - add a printer icon - fix permalink

---
 chimere/static/chimere/css/styles.css       |   4 ++++
 chimere/static/chimere/img/images_licences  |   3 ++-
 chimere/static/chimere/img/printer.png      | Bin 0 -> 914 bytes
 chimere/static/chimere/img/share-icon.png   | Bin 0 -> 2148 bytes
 chimere/static/chimere/img/share-icon.xcf   | Bin 0 -> 5431 bytes
 chimere/static/chimere/js/jquery.chimere.js |  24 +++++++++++++-----------
 6 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 chimere/static/chimere/img/printer.png
 create mode 100644 chimere/static/chimere/img/share-icon.png
 create mode 100644 chimere/static/chimere/img/share-icon.xcf

(limited to 'chimere/static')

diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index df3743d..001fa7b 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -347,6 +347,10 @@ ul.share li{
     height:22px;
 }
 
+.share .share-icon img{
+    width:74px;
+}
+
 .detail_footer{
     text-align:center;
     position:absolute;
diff --git a/chimere/static/chimere/img/images_licences b/chimere/static/chimere/img/images_licences
index cbc9307..d6d2773 100644
--- a/chimere/static/chimere/img/images_licences
+++ b/chimere/static/chimere/img/images_licences
@@ -22,7 +22,8 @@ Url: http://commons.wikimedia.org/wiki/File:Internet-web-browser.svg
 Author: The Tango! Desktop Project
 Licence: Public domain
 Url: http://commons.wikimedia.org/wiki/File:Edit-find-replace.svg
-Url 2: http://commons.wikimedia.org/wiki/File:Internet-web-browser.svg
+     http://commons.wikimedia.org/wiki/File:Internet-web-browser.svg
+     https://commons.wikimedia.org/wiki/File:Document-print.svg
 
 * Quaver image credit (8thNote.png)
 
diff --git a/chimere/static/chimere/img/printer.png b/chimere/static/chimere/img/printer.png
new file mode 100644
index 0000000..5a5dbaf
Binary files /dev/null and b/chimere/static/chimere/img/printer.png differ
diff --git a/chimere/static/chimere/img/share-icon.png b/chimere/static/chimere/img/share-icon.png
new file mode 100644
index 0000000..89b631c
Binary files /dev/null and b/chimere/static/chimere/img/share-icon.png differ
diff --git a/chimere/static/chimere/img/share-icon.xcf b/chimere/static/chimere/img/share-icon.xcf
new file mode 100644
index 0000000..d149768
Binary files /dev/null and b/chimere/static/chimere/img/share-icon.xcf differ
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 3a067f2..d7da137 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -591,9 +591,10 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             settings.layerMarkers.addMarker(marker);
             /* show the item when designed in the permalink */
             if (settings.display_feature == feature.pk){
+                settings.current_feature = feature;
                 _popup(feature);
                 methods.display_feature_detail(feature.pk);
-                settings.map.setCenter(feature.lonlat, 16);
+                _repan_popup();
                 methods.loadCategories();
             }
             return feature;
@@ -864,22 +865,23 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             uri += "getDetail/" + pk;
             var params = {}
             if (settings.simple) { params["simple"] = 1; }
-            $.ajax({url: uri, 
+            $.ajax({url: uri,
                     data: params,
+                    dataType: "html",
                     success: function (data) {
-                            if ( settings.display_feature_detail_fx ) {
-                                // Custom function ?
-                                settings.display_feature_detail_fx(data, settings);
+                        if ( settings.display_feature_detail_fx ) {
+                            // Custom function ?
+                            settings.display_feature_detail_fx(data, settings);
+                        }
+                        else {
+                            if (!settings.popupContentFull) {
+                                $('#detail').html(data).show();
                             }
                             else {
-                                if (!settings.popupContentFull) {
-                                    $('#detail').html(data).show();
-                                }
-                                else {
-                                    settings.current_popup.setContentHTML("<div class='cloud'>" + data + "</div>");
-                                }
+                                settings.current_popup.setContentHTML("<div class='cloud'>" + data + "</div>");
                             }
                         }
+                    }
                    });
         },
         center_on_feature: function(feature) {
-- 
cgit v1.2.3