--- loncom/html/res/adm/pages/menu.html 2002/09/09 18:30:19 1.66.2.1 +++ loncom/html/res/adm/pages/menu.html 2002/10/25 14:04:42 1.72 @@ -4,7 +4,7 @@ The LearningOnline Network with CAPA Remote Control // -// $Id: menu.html,v 1.66.2.1 2002/09/09 18:30:19 albertel Exp $ +// $Id: menu.html,v 1.72 2002/10/25 14:04:42 www Exp $ // // Copyright Michigan State University Board of Trustees // @@ -45,11 +45,14 @@ var statustop = ''; var statusbot = ''; var active = 0; var dislocked = 1; +var statuslocked = 0; var imgpath='/res/adm/pages/'; var fontpath='/adm/lonLCDfont/'; var currentURL=''; var reloadURL=''; +var currentSymb=''; +var reloadSymb=''; var currentStale=1; var menucltim; @@ -95,30 +98,30 @@ function syncclock(servertime) { function advanceclock() { var clock=new Date(); clock.setTime(clock.getTime()+clockdelta); + if (!statuslocked) { + var days=""+clock.getDate(); + if (days.length<2) { days="0"+days; } + var mons=""+(clock.getMonth()+1); + if (mons.length<2) { mons="0"+mons; } + var years=""+clock.getYear(); + + if (years>1000) { + years=years.substring(2,4); + } else { + years=years.substring(1,3); + } + statustop=mons+'/'+days+'/'+years; + + var secs=""+clock.getSeconds(); + if (secs.length<2) { secs="0"+secs; } + var mins=""+clock.getMinutes(); + if (mins.length<2) { mins="0"+mins; } + var hours=""+clock.getHours(); + if (hours.length<2) { hours=" "+hours; } + statusbot=hours+':'+mins+':'+secs; - var days=""+clock.getDate(); - if (days.length<2) { days="0"+days; } - var mons=""+(clock.getMonth()+1); - if (mons.length<2) { mons="0"+mons; } - var years=""+clock.getYear(); - - if (years>1000) { - years=years.substring(2,4); - } else { - years=years.substring(1,3); + if (!dislocked) { showdisplay(); } } - statustop=mons+'/'+days+'/'+years; - - var secs=""+clock.getSeconds(); - if (secs.length<2) { secs="0"+secs; } - var mins=""+clock.getMinutes(); - if (mins.length<2) { mins="0"+mins; } - var hours=""+clock.getHours(); - if (hours.length<2) { hours=" "+hours; } - statusbot=hours+':'+mins+':'+secs; - - if (!dislocked) { showdisplay(); } - setTimeout('advanceclock();',1000); } @@ -225,11 +228,11 @@ function clearbut(row,col) { } function setstatus(tp,bt) { - this.document['led'].src="ledblink.gif"; + this.document['led'].src="http://"+clienthost+imgpath+"ledblink.gif"; statustop=tp; statusbot=bt; + statuslocked=1; defdis(); - endsend(); } function is_editable_resource (url) { @@ -270,33 +273,39 @@ function cstrgo(currenturl,defaulturl) { function go(url) { windowcheck(); + statuslocked=0; this.document['led'].src="ledsend.gif"; if (url!='' && url!= null) { currentURL = null; + currentSymb= null; clientwindow.window.location.href="http://"+clienthost+url; } } function gopost(url,postdata) { windowcheck(); - this.document['led'].src="ledsend.gif"; + statuslocked=0; + this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif"; if (url!='') { this.document.server.action="http://"+clienthost+url; this.document.server.postdata.value=postdata; this.document.server.command.value=''; this.document.server.url.value=''; + this.document.server.symb.value=''; this.document.server.submit(); } } function gocmd(url,cmd) { windowcheck(); - this.document['led'].src="ledsend.gif"; + statuslocked=0; + this.document['led'].src="http://"+clienthost+imgpath+"ledsend.gif"; if (url!='') { this.document.server.action="http://"+clienthost+url; this.document.server.postdata.value=''; this.document.server.command.value=cmd; this.document.server.url.value=currentURL; + this.document.server.symb.value=currentSymb; this.document.server.submit(); } } @@ -348,7 +357,7 @@ function edit_bookmarks() { function catalog_info() { go(''); w_LONcatInfo_flag=1; - loncatinfo=window.open(clientwindow.window.location.href+'.meta',"LONcatInfo"); + loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"LONcatInfo"); } // --> @@ -478,6 +487,7 @@ function catalog_info() { +