diff --git a/Site/App_GlobalResources/Global.designer.cs b/Site/App_GlobalResources/Global.designer.cs index 87dbfb12..97b424e6 100644 --- a/Site/App_GlobalResources/Global.designer.cs +++ b/Site/App_GlobalResources/Global.designer.cs @@ -1929,7 +1929,7 @@ namespace Resources { } /// - /// Looks up a localized string similar to No urgent action items right now.. + /// Looks up a localized string similar to <strong>All Clear:</strong> There are no urgent action items. Yay!. /// internal static string Sidebar_Todo_None { get { diff --git a/Site/App_GlobalResources/Global.resx b/Site/App_GlobalResources/Global.resx index dfe65b54..bb7439da 100644 --- a/Site/App_GlobalResources/Global.resx +++ b/Site/App_GlobalResources/Global.resx @@ -281,7 +281,7 @@ List of todo items - No urgent action items right now. + <strong>All Clear:</strong> There are no urgent action items. Yay! Indicator that nothing needs immediate attention diff --git a/Site/Master-v5.master b/Site/Master-v5.master index 0715d38c..f6720716 100644 --- a/Site/Master-v5.master +++ b/Site/Master-v5.master @@ -781,6 +781,7 @@ var _errorDisplay_clientSocketLost = SwarmopsJS.unescape('<%=this.Localized_ClientError_SocketFail%>'); var _errorDisplay_clientHeartbeatLost = SwarmopsJS.unescape('<%=this.Localized_ClientError_HeartbeatFail%>'); var _errorDisplay_allClear = SwarmopsJS.unescape('<%=this.Localized_AllErrorsClear%>'); + var _todoDisplay_allClear = SwarmopsJS.unescape('<%=this.Localized_AllTodosClear%>'); diff --git a/Site/Master-v5.master.cs b/Site/Master-v5.master.cs index 59f6fcc7..bda4ef25 100644 --- a/Site/Master-v5.master.cs +++ b/Site/Master-v5.master.cs @@ -540,6 +540,11 @@ namespace Swarmops.Frontend get { return CommonV5.JavascriptEscape(ErrorMessages.Localized("AllClear")); } } + public string Localized_AllTodosClear + { + get { return CommonV5.JavascriptEscape(Resources.Global.Sidebar_Todo_None); } + } + public string GenerateBitIdToken { get diff --git a/Site/Scripts/Swarmops-v5.js b/Site/Scripts/Swarmops-v5.js index 0c730554..308e9cf8 100644 --- a/Site/Scripts/Swarmops-v5.js +++ b/Site/Scripts/Swarmops-v5.js @@ -113,8 +113,7 @@ function _masterInitializeSocket(authenticationTicket) { } function _master_watchHeartbeat() { - console.log("WatchHeartbeat()"); - + _masterWatchingHeartbeat = true; // Check again for a new heartbeat in ten seconds @@ -132,19 +131,14 @@ function _master_watchHeartbeat() { // If we got a heartbeat more than fifteen seconds ago, we've lost the heartbeat - console.log(" - checking timestamps"); - if (_masterSocketLastHeartbeat != -1 && !_masterSocketHeartbeatsLost) { // if we've received any at all var curTime = new Date().getTime(); var diff = (curTime - _masterSocketLastHeartbeat) / 1000; - console.log(" - last heartbeat was " + diff + " seconds ago"); if (diff > 15) { console.log(" - Heartbeats LOST"); _masterSocketHeartbeatsLost = true; _master_updateMalfunctions(); } - } else { - console.log(" - no previous heartbeat received"); } } @@ -161,8 +155,6 @@ function getMasterSocketAddress() { function _master_updateMalfunctions(issueList) { - console.log("UpdateMalfunctions();"); - if (issueList === undefined) { issueList = JSON.parse(JSON.stringify(_master_LastServerMalfunctionsList)); // deep copy } else {