--- loncom/html/res/adm/pages/menu.html 2001/05/01 03:44:41 1.24 +++ loncom/html/res/adm/pages/menu.html 2001/05/09 22:59:21 1.30 @@ -10,6 +10,8 @@ Jan Guy Albertelli 2/19 Guy Albertelli 3/21 Gerd Kortemeyer 4/30 Ben Tyszka +5/2 Scott Harrison +5/4,5/9 Gerd Kortemeyer --> LON-CAPA Remote @@ -28,6 +30,25 @@ statustop=''; statusbot=''; active=0; +var currentURL=''; +var currentStale=1; + +// not used (yet) +// var w_Annotator; +// var w_bmquery; +// var w_BookmarkPal; +// var w_LONcatInfo; + +////////////////////////////////////// +var w_Annotator_flag=-1; +var w_bmquery_flag=-1; +var w_BookmarkPal_flag=-1; +var w_LONcatInfo_flag=-1; + // 1 means currently open + // 0 means closed (but has been open) + // -1 means never yet opened/defined +/////////////////////////////////////// + clienthost=window.location.host; clientwindow=opener; @@ -42,6 +63,18 @@ function logout () { windowcheck(); if (clientwindow.status!='MenuControl:nologout') { + if (w_Annotator_flag!=-1 && annotator && !annotator.closed) { + annotator.close(); + } + if (w_bmquery_flag!=-1 && bmquery && !bmquery.closed) { + bmquery.close(); + } + if (w_BookmarkPal_flag!=-1 && bookmarkpal && !bookmarkpal.closed) { + bookmarkpal.close(); + } + if (w_LONcatInfo_flag!=-1 && loncatinfo && !loncatinfo.closed) { + loncatinfo.close(); + } clientwindow.window.location.href="http://"+clienthost+"/adm/logout"; } } @@ -109,6 +142,7 @@ function gopost(url,postdata) { } function annotate() { + w_Annotator_flag=1; annotator=window.open('','Annotator','width=365,height=265,scrollbars=0'); annotator.document.write( "" @@ -123,6 +157,7 @@ function set_bookmark() { go(''); clienttitle="Enter Title"; clienthref="Enter Address"; + w_bmquery_flag=1; bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0'); bmquery.document.write( "