Merge Rowan's html code + slightly update styles

[matches/MCTX3420.git] / testing / MCTXWeb / public_html / static / mctx.gui.js

diff --git a/testing/MCTXWeb/public_html/static/mctx.gui.js b/testing/MCTXWeb/public_html/static/mctx.gui.js
index 180c395..82f823c 100644 (file)
--- a/testing/MCTXWeb/public_html/static/mctx.gui.js
+++ b/testing/MCTXWeb/public_html/static/mctx.gui.js
@@ -22,7 +22,8 @@ mctx.sensors = {
   2 : {name : "Strain gauge 3"},
   3 : {name : "Strain gauge 4"},
   4 : {name : "Pressure sensor 1"},
-  5 : {name : "Pressure sensor 2"}
+  5 : {name : "Pressure sensor 2"},
+  6 : {name : "Pressure sensor 3"}
 };
 
 mctx.actuators = {
@@ -81,8 +82,8 @@ $.fn.populateNavbar = function () {
     return {text : items[item].name, href : href};
   };
   
-  menu.populateSubmenu("Sensor data dump", mctx.sensors, sensorTranslator);
-  menu.populateSubmenu("Actuator data dump", mctx.actuators, actuatorTranslator);
+  menu.populateSubmenu("Sensor data", mctx.sensors, sensorTranslator);
+  menu.populateSubmenu("Actuator data", mctx.actuators, actuatorTranslator);
   menu.appendTo(this);
   return this;
 }
@@ -194,4 +195,8 @@ $.fn.setErrorLog = function () {
   };
   
   updater();
-};
\ No newline at end of file
+};
+
+$(document).ajaxError(function (event, jqXHR) {
+  //console.log("AJAX query failed with: " + jqXHR.status + " (" + jqXHR.statusText + ")");
+});
\ No newline at end of file