nicer info window displays

git-svn-id: https://svn.code.sf.net/p/freetel/code@259 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/dilimesh/README.txt b/dilimesh/README.txt
index 8c1e91b54019b07cfcc69fdd04392ac5186cc0f7..622edba6ffde7f8f5a72ff869ee1a3d22d75102e 100644 (file)
--- a/dilimesh/README.txt
+++ b/dilimesh/README.txt
@@ -152,7 +152,7 @@ Installation
 
 4/ (Optional) Signal strength daemon:
 
-  Copy these scripts to each MP in your mesh that you wish to read sis
+  Copy these scripts to each MP in your mesh that you wish to read sig
   strength from:
   
     $ cd dilimesh/script

diff --git a/dilimesh/dilimesh/dilimesh.html b/dilimesh/dilimesh/dilimesh.html
index 793800ffb785b38efbde6094526a7da8399b184c..393d834bcea808329f91044f27e10e99480b9780 100644 (file)
--- a/dilimesh/dilimesh/dilimesh.html
+++ b/dilimesh/dilimesh/dilimesh.html
@@ -358,12 +358,17 @@
       var packet_loss_formatted = Math.round(nodes[j].packet_loss*100);
 
       nodes[j].marker.setTitle(nodes[j].ip + ' Packet Loss: ' + packet_loss_formatted + '%');  
-      var html = nodes[j].ip + '<br>Packet Loss: ' + packet_loss_formatted + '%';
+      var html  = '<table>';
+          html += '<tr><th>' + nodes[j].ip + '</th></tr>';
+          html += '<tr><td>Packet Loss</td><td>' + packet_loss_formatted + '%</td></tr>';
       if (nodes[j].neighbour_ips != undefined) {
         for(var i=0; i<nodes[j].neighbour_ips.length; i++) {
-          html += '<br>' + trim(nodes[j].neighbour_ips[i]) + ' ' + trim(nodes[j].neighbour_sigs[i]) + ' dBm';
+          html += '<tr><td>' + trim(nodes[j].neighbour_ips[i]) + '</td><td>';
+          html += trim(nodes[j].neighbour_sigs[i]) + ' dBm</td><td>';
        }
       }
+      html += '</table>';
+
       nodes[j].infowindow.setContent(html);  
     }  
 
@@ -413,12 +418,11 @@
         if (nodes[j].ip == ip) {
           nodes[j].neighbour_ips  = neighbour_ips;
           nodes[j].neighbour_sigs = neighbour_sigs;
-          var html="";
+          var html="<table>";
           for(var i=0; i<neighbour_ips.length; i++) {
-            html += trim(neighbour_ips[i]) + ' ' + trim(neighbour_sigs[i]) + ' dBm';
-            if (i != (neighbour_ips.length-1))
-              html += '<br>';
+            html += '<tr><td>' + trim(neighbour_ips[i]) + '</td><td>' + trim(neighbour_sigs[i]) + ' dBm</td></tr>';
          }
+          html += '</table>';
          document.getElementById('sigstr_last_node').innerHTML = ip;
          document.getElementById('sigstr_results').innerHTML = html;
         }    
@@ -431,7 +435,7 @@
 
   function drawPathesBetweenNodes() {
 
-    // delete all exisiting paths, this is inefficient but is OK for a first pass
+    // delete all existing paths, this is inefficient but is OK for a first pass
       
     if (pathes) {
       for (j in pathes) {
@@ -516,8 +520,7 @@
     // add to nodes array
 
     var newInfoWindow = new google.maps.InfoWindow(
-      { content: newIp,
-        maxWidth: 20
+      { content: newIp
       });
     var newNode = {marker : newMarker, 
                    ip: newIp, 
@@ -562,8 +565,7 @@
       // add node to nodes array
 
       var newInfoWindow = new google.maps.InfoWindow(
-        {  content: dragIp,
-           maxWidth: 20
+        {  content: dragIp
         });
       var newNode = {marker : newMarker, 
                      ip: dragIp, 

diff --git a/dilimesh/dilimesh_screenshot.png b/dilimesh/dilimesh_screenshot.png
index e74f69f9d8cffdc9e93bbb8a7f5382add2a91fb6..7c26086671181f05e5fe0c8f9fa7b1d7b7d0f591 100644 (file)
Binary files a/dilimesh/dilimesh_screenshot.png and b/dilimesh/dilimesh_screenshot.png differ