Fixed #77 and #78.

close #77 close #78
ninuxorg · Apr 3, 2012 · d25f836 · d25f836
1 parent 48716fc
commit d25f836
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/locale/it/LC_MESSAGES/django.mo b/locale/it/LC_MESSAGES/django.mo
diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po
@@ -157,6 +157,9 @@ msgstr ""
 msgid "dBm not available"
 msgstr "dBm non disponibile"
 
+msgid "not available"
+msgstr "non disponibile"
+
 msgid "Delete \"%(node)s\""
 msgstr "Elimina \"%(node)s\""
 

diff --git a/media/js/nodeshot.js b/media/js/nodeshot.js
@@ -1812,13 +1812,21 @@ var nodeshot = {
                 strokeOpacity: opacity,
                 strokeWeight: 5 
             });
-            // click event for polyline
+            // if not a distance calculation link
-            link.clickListener = google.maps.event.addListener(link, 'click',  function(event){
+            if(quality!=4){
-                nodeshot.gmap.infoWindow.setContent('<b>etx</b>: '+etx+'<br /><b>dBm</b>: '+dbm);
+                // if dBm info is not available
-                nodeshot.gmap.infoWindow.maxWidth = 50;
+                if(dbm==0){
-                nodeshot.gmap.infoWindow.position = event.latLng;
+                    // write something human readable instead of 0    
-                nodeshot.gmap.infoWindow.open(nodeshot.gmap.map);
+                    dbm = i18n.NOT_AVAILABLE 
-            });
+                }
+                // add an onclick event for the link which shows etx and dBm
+                link.clickListener = google.maps.event.addListener(link, 'click',  function(event){
+                    nodeshot.gmap.infoWindow.setContent('<b>etx</b>: '+etx+'<br /><b>dBm</b>: '+dbm);
+                    nodeshot.gmap.infoWindow.maxWidth = 50;
+                    nodeshot.gmap.infoWindow.position = event.latLng;
+                    nodeshot.gmap.infoWindow.open(nodeshot.gmap.map);
+                });   
+            }
             // show link on gmap
             link.setMap(nodeshot.gmap.map);
             // return link object - needed by nodeshot.distance.add()

diff --git a/nodeshot/templates/i18n_fragment.html b/nodeshot/templates/i18n_fragment.html
@@ -20,5 +20,6 @@
     SAVE: "{% trans 'save' %}",
     DELETE: "{% trans 'delete' %}",
     SMTP_ERROR: "{% trans 'The message cannot be sent because the outgoing email server is temporarily unavailable. Try again later. We apologize for the inconvenience.' %}",
-    NODE_DOESNT_EXIST: "{% trans 'The node does not exist' %}"
+    NODE_DOESNT_EXIST: "{% trans 'The node does not exist' %}",
+    NOT_AVAILABLE: "{% trans 'not available' %}"
 }