NDT-DEV email list created

Revision: 1216
Author:   

Date:     Fri Mar 20 12:14:29 2015 UTC
Log:      Merge Issue173 branch into trunk

https://code.google.com/p/ndt/source/detail?r=1216

Modified:
 /trunk
 /trunk/HTML5-frontend/script.js
 /trunk/HTML5-frontend/style.css
 /trunk/HTML5-frontend/widget.html

=======================================
--- /trunk/HTML5-frontend/script.js     Fri Mar 20 12:12:24 2015 UTC
+++ /trunk/HTML5-frontend/script.js     Fri Mar 20 12:14:29 2015 UTC
@@ -196,8 +196,8 @@
       debug("SHOW RESULTS");
       debug('Testing complete');

-      document.getElementById('upload-speed').innerHTML =  
uploadSpeed().toPrecision(2);
-      document.getElementById('download-speed').innerHTML =  
downloadSpeed().toPrecision(2);
+      printDownloadSpeed();
+      printUploadSpeed();
       document.getElementById('latency').innerHTML =  
Math.round(averageRoundTrip());
       document.getElementById('jitter').innerHTML = printJitter(false);
       document.getElementById("test-details").innerHTML = testDetails();
@@ -430,6 +430,30 @@
   }
   return retStr;
 }
+
+function printDownloadSpeed() {
+  var downloadSpeedVal = downloadSpeed();
+  if (downloadSpeedVal >= 1000) {
+    downloadSpeedVal = parseFloat(downloadSpeedVal/1000);
+    document.getElementById('download-speed').innerHTML =  
downloadSpeedVal.toFixed(2);
+    document.getElementById('download-speed-units').innerHTML = 'gb/s';
+  } else {
+    document.getElementById('download-speed').innerHTML =  
downloadSpeedVal.toFixed(2);
+    document.getElementById('download-speed-units').innerHTML = 'mb/s';
+  }
+}
+
+function printUploadSpeed() {
+  var uploadSpeedVal = uploadSpeed(false);
+  if (uploadSpeedVal >= 1000) {
+    uploadSpeedVal = parseFloat(uploadSpeedVal/1000);
+    document.getElementById('upload-speed').innerHTML =  
uploadSpeedVal.toFixed(2);
+    document.getElementById('upload-speed-units').innerHTML = 'gb/s';
+  } else {
+    document.getElementById('upload-speed').innerHTML =  
uploadSpeedVal.toFixed(2);
+    document.getElementById('upload-speed-units').innerHTML = 'mb/s';
+  }
+}

 function testDetails() {
   if (simulate) return 'Test details';
=======================================
--- /trunk/HTML5-frontend/style.css     Fri Jan  9 15:36:25 2015 UTC
+++ /trunk/HTML5-frontend/style.css     Fri Mar 20 12:14:29 2015 UTC
@@ -255,7 +255,7 @@
   border: 1px solid white;
 }
 #results .result .number {
-  font-size: 128px;
+  font-size: 100px;
   line-height: 128px;
   color: white;
 }
=======================================
--- /trunk/HTML5-frontend/widget.html   Fri Mar 20 12:12:24 2015 UTC
+++ /trunk/HTML5-frontend/widget.html   Fri Mar 20 12:14:29 2015 UTC
@@ -96,7 +96,7 @@
           <h3>Upload speed</h3>
           <p>
             <span class="number" id="upload-speed">0.00</span>
-            <span class="units">mb/s</span>
+            <span class="units" id="upload-speed-units">mb/s</span>
           </p>
         </div>

@@ -104,7 +104,7 @@
           <h3>Download speed</h3>
           <p>
             <span class="number" id="download-speed">0.00</span>
-            <span class="units">mb/s</span>
+            <span class="units" id="download-speed-units">mb/s</span>
         </div>

         <div class="other">