Author: tmckay Date: 2011-06-14 19:05:44 +0000 (Tue, 14 Jun 2011) New Revision: 4823
Modified: branches/clarity/cumin/python/cumin/widgets.strings Log: Merge 4775 from trunk. BZ697075
Modified: branches/clarity/cumin/python/cumin/widgets.strings =================================================================== --- branches/clarity/cumin/python/cumin/widgets.strings 2011-06-14 19:03:33 UTC (rev 4822) +++ branches/clarity/cumin/python/cumin/widgets.strings 2011-06-14 19:05:44 UTC (rev 4823) @@ -110,7 +110,13 @@
[CuminMainView.javascript] cumin.set_updated = function () { - $('heartbeat').set('text', "Updated " + new Date().format("%Y-%m-%d %H:%M:%S")); + var updateStr; + var kiosk = wooly.session.branch()["kiosk"]; + if (kiosk != null && kiosk != undefined) + updateStr = "**Updated " + else + updateStr = "Updated " + $('heartbeat').set('text', updateStr + new Date().format("%Y-%m-%d %H:%M:%S")); $('shock').style.display = "none"; $('heartbeat').style.display = "inline"; $('heartbeat').style.color = "#000000"; @@ -129,18 +135,23 @@ cumin.expireID = null; } } - cumin.expireID = setTimeout(function () { - wooly.cancelIntervalUpdate(); - setTimeout(function () { - $('heartbeat').style.display = "none"; - $('shock').style.display = "block"}, 1000); - $('shock').onclick = function () { - wooly.updateNow(); - wooly.resumeIntervalUpdate(); - cumin.expireIntervalUpdate(); - cumin.set_updated(); - } - }, 30*60*1000); + // A "kiosk" NV pair in the URL prevents timeouts + var kiosk = wooly.session.branch()["kiosk"] + if (kiosk == null || kiosk == undefined) + { + cumin.expireID = setTimeout(function () { + wooly.cancelIntervalUpdate(); + setTimeout(function () { + $('heartbeat').style.display = "none"; + $('shock').style.display = "block"}, 1000); + $('shock').onclick = function () { + wooly.updateNow(); + wooly.resumeIntervalUpdate(); + cumin.expireIntervalUpdate(); + cumin.set_updated(); + } + }, 30*60*1000); + }; }; cumin.expireIntervalUpdate(); window.addEvent('domready', function () {
cumin-developers@lists.fedorahosted.org