[LON-CAPA-cvs] cvs: loncom /html/res/adm/pages menu.html /interface lonmenu.pm /xml lonxml.pm

www lon-capa-cvs@mail.lon-capa.org
Wed, 15 Jan 2003 23:59:27 -0000


This is a MIME encoded message

--www1042675167
Content-Type: text/plain

www		Wed Jan 15 18:59:27 2003 EDT

  Modified files:              
    /loncom/html/res/adm/pages	menu.html 
    /loncom/interface	lonmenu.pm 
    /loncom/xml	lonxml.pm 
  Log:
  Remote control has "tool hint" bubbles.
  
  
--www1042675167
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20030115185927.txt"

Index: loncom/html/res/adm/pages/menu.html
diff -u loncom/html/res/adm/pages/menu.html:1.82 loncom/html/res/adm/pages/menu.html:1.83
--- loncom/html/res/adm/pages/menu.html:1.82	Wed Dec 11 13:41:04 2002
+++ loncom/html/res/adm/pages/menu.html	Wed Jan 15 18:59:26 2003
@@ -4,7 +4,7 @@
 Remote Control
 
 //
-// $Id: menu.html,v 1.82 2002/12/11 18:41:04 albertel Exp $
+// $Id: menu.html,v 1.83 2003/01/15 23:59:26 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -224,6 +224,7 @@
    dt[idx]=texttop;
    db[idx]=textbot;
    ds[idx]=desc;
+   eval('this.document.links.link'+idx+'.title="'+desc+'"');
 } 
 
 function clearbut(row,col) {
@@ -233,6 +234,7 @@
    dt[idx]='';
    db[idx]='';
    ds[idx]='';
+   eval('this.document.links.link'+idx+'.title=""');
 }
 
 function setstatus(tp,bt) {
@@ -445,66 +447,66 @@
 <table hspace="0" border="0" cellspacing="0" cellpadding="0">
 
 <tr>
-<td colspan="2"><a href="javascript:eval(hr[11]);" onMouseOver="display(dt[11],db[11]);"><img width="86" height="20" border="0" name="b11" src="dempty.gif" /></a></td>
-<td><a href="javascript:eval(hr[12]);" onMouseOver="display(dt[12],db[12]);"><img width="43" height="20" border="0" name="b12" src="empty.gif" /></a></td>
+<td colspan="2"><a name="link11" href="javascript:eval(hr[11]);" onMouseOver="display(dt[11],db[11]);"><img width="86" height="20" border="0" name="b11" src="dempty.gif" /></a></td>
+<td><a name="link12" href="javascript:eval(hr[12]);" onMouseOver="display(dt[12],db[12]);"><img width="43" height="20" border="0" name="b12" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td rowspan="2"><a href="javascript:eval(hr[21]);" onMouseOver="display(dt[21],db[21]);"><img width="43" height="40" border="0" name="b21" src="qempty.gif" /></a></td>
-<td><a href="javascript:eval(hr[22]);" onMouseOver="display(dt[22],db[22]);"><img width="43" height="20" border="0" name="b22" src="empty.gif" /></a></td>
-<td rowspan="2"><a href="javascript:eval(hr[23]);" onMouseOver="display(dt[23],db[23]);"><img width="43" height="40" border="0" name="b23" src="qempty.gif" /></a></td>
+<td rowspan="2"><a name="link21" href="javascript:eval(hr[21]);" onMouseOver="display(dt[21],db[21]);"><img width="43" height="40" border="0" name="b21" src="qempty.gif" /></a></td>
+<td><a name="link22" href="javascript:eval(hr[22]);" onMouseOver="display(dt[22],db[22]);"><img width="43" height="20" border="0" name="b22" src="empty.gif" /></a></td>
+<td rowspan="2"><a name="link23" href="javascript:eval(hr[23]);" onMouseOver="display(dt[23],db[23]);"><img width="43" height="40" border="0" name="b23" src="qempty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[31]);" onMouseOver="display(dt[31],db[31]);"><img width="43" height="20" border="0" name="b31" src="empty.gif" /></a></td>
+<td><a name="link31" href="javascript:eval(hr[31]);" onMouseOver="display(dt[31],db[31]);"><img width="43" height="20" border="0" name="b31" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[41]);" onMouseOver="display(dt[41],db[41]);"><img width="43" height="20" border="0" name="b41" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[42]);" onMouseOver="display(dt[42],db[42]);"><img width="43" height="20" border="0" name="b42" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[43]);" onMouseOver="display(dt[43],db[43]);"><img width="43" height="20" border="0" name="b43" src="empty.gif" /></a></td>
+<td><a name="link41" href="javascript:eval(hr[41]);" onMouseOver="display(dt[41],db[41]);"><img width="43" height="20" border="0" name="b41" src="empty.gif" /></a></td>
+<td><a name="link42" href="javascript:eval(hr[42]);" onMouseOver="display(dt[42],db[42]);"><img width="43" height="20" border="0" name="b42" src="empty.gif" /></a></td>
+<td><a name="link43" href="javascript:eval(hr[43]);" onMouseOver="display(dt[43],db[43]);"><img width="43" height="20" border="0" name="b43" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[51]);" onMouseOver="display(dt[51],db[51]);"><img width="43" height="20" border="0" name="b51" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[52]);" onMouseOver="display(dt[52],db[52]);"><img width="43" height="20" border="0" name="b52" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[53]);" onMouseOver="display(dt[53],db[53]);"><img width="43" height="20" border="0" name="b53" src="empty.gif" /></a></td>
+<td><a name="link51" href="javascript:eval(hr[51]);" onMouseOver="display(dt[51],db[51]);"><img width="43" height="20" border="0" name="b51" src="empty.gif" /></a></td>
+<td><a name="link52" href="javascript:eval(hr[52]);" onMouseOver="display(dt[52],db[52]);"><img width="43" height="20" border="0" name="b52" src="empty.gif" /></a></td>
+<td><a name="link53" href="javascript:eval(hr[53]);" onMouseOver="display(dt[53],db[53]);"><img width="43" height="20" border="0" name="b53" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[61]);" onMouseOver="display(dt[61],db[61]);"><img width="43" height="20" border="0" name="b61" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[62]);" onMouseOver="display(dt[62],db[62]);"><img width="43" height="20" border="0" name="b62" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[63]);" onMouseOver="display(dt[63],db[63]);"><img width="43" height="20" border="0" name="b63" src="empty.gif" /></a></td>
+<td><a name="link61" href="javascript:eval(hr[61]);" onMouseOver="display(dt[61],db[61]);"><img width="43" height="20" border="0" name="b61" src="empty.gif" /></a></td>
+<td><a name="link62" href="javascript:eval(hr[62]);" onMouseOver="display(dt[62],db[62]);"><img width="43" height="20" border="0" name="b62" src="empty.gif" /></a></td>
+<td><a name="link63" href="javascript:eval(hr[63]);" onMouseOver="display(dt[63],db[63]);"><img width="43" height="20" border="0" name="b63" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[71]);" onMouseOver="display(dt[71],db[71]);"><img width="43" height="20" border="0" name="b71" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[72]);" onMouseOver="display(dt[72],db[72]);"><img width="43" height="20" border="0" name="b72" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[73]);" onMouseOver="display(dt[73],db[73]);"><img width="43" height="20" border="0" name="b73" src="empty.gif" /></a></td>
+<td><a name="link71" href="javascript:eval(hr[71]);" onMouseOver="display(dt[71],db[71]);"><img width="43" height="20" border="0" name="b71" src="empty.gif" /></a></td>
+<td><a name="link72" href="javascript:eval(hr[72]);" onMouseOver="display(dt[72],db[72]);"><img width="43" height="20" border="0" name="b72" src="empty.gif" /></a></td>
+<td><a name="link73" href="javascript:eval(hr[73]);" onMouseOver="display(dt[73],db[73]);"><img width="43" height="20" border="0" name="b73" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[81]);" onMouseOver="display(dt[81],db[81]);"><img width="43" height="20" border="0" name="b81" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[82]);" onMouseOver="display(dt[82],db[82]);"><img width="43" height="20" border="0" name="b82" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[83]);" onMouseOver="display(dt[83],db[83]);"><img width="43" height="20" border="0" name="b83" src="empty.gif" /></a></td>
+<td><a name="link81" href="javascript:eval(hr[81]);" onMouseOver="display(dt[81],db[81]);"><img width="43" height="20" border="0" name="b81" src="empty.gif" /></a></td>
+<td><a name="link82" href="javascript:eval(hr[82]);" onMouseOver="display(dt[82],db[82]);"><img width="43" height="20" border="0" name="b82" src="empty.gif" /></a></td>
+<td><a name="link83" href="javascript:eval(hr[83]);" onMouseOver="display(dt[83],db[83]);"><img width="43" height="20" border="0" name="b83" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[91]);" onMouseOver="display(dt[91],db[91]);"><img width="43" height="20" border="0" name="b91" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[92]);" onMouseOver="display(dt[92],db[92]);"><img width="43" height="20" border="0" name="b92" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[93]);" onMouseOver="display(dt[93],db[93]);"><img width="43" height="20" border="0" name="b93" src="empty.gif" /></a></td>
+<td><a name="link91" href="javascript:eval(hr[91]);" onMouseOver="display(dt[91],db[91]);"><img width="43" height="20" border="0" name="b91" src="empty.gif" /></a></td>
+<td><a name="link92" href="javascript:eval(hr[92]);" onMouseOver="display(dt[92],db[92]);"><img width="43" height="20" border="0" name="b92" src="empty.gif" /></a></td>
+<td><a name="link93" href="javascript:eval(hr[93]);" onMouseOver="display(dt[93],db[93]);"><img width="43" height="20" border="0" name="b93" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[101]);" onMouseOver="display(dt[101],db[101]);"><img width="43" height="20" border="0" name="b101" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[102]);" onMouseOver="display(dt[102],db[102]);"><img width="43" height="20" border="0" name="b102" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[103]);" onMouseOver="display(dt[103],db[103]);"><img width="43" height="20" border="0" name="b103" src="empty.gif" /></a></td>
+<td><a name="link101" href="javascript:eval(hr[101]);" onMouseOver="display(dt[101],db[101]);"><img width="43" height="20" border="0" name="b101" src="empty.gif" /></a></td>
+<td><a name="link102" href="javascript:eval(hr[102]);" onMouseOver="display(dt[102],db[102]);"><img width="43" height="20" border="0" name="b102" src="empty.gif" /></a></td>
+<td><a name="link103" href="javascript:eval(hr[103]);" onMouseOver="display(dt[103],db[103]);"><img width="43" height="20" border="0" name="b103" src="empty.gif" /></a></td>
 </tr>
 
 <tr>
-<td><a href="javascript:eval(hr[111]);" onMouseOver="display(dt[111],db[111]);"><img width="43" height="20" border="0" name="b111" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[112]);" onMouseOver="display(dt[112],db[112]);"><img width="43" height="20" border="0" name="b112" src="empty.gif" /></a></td>
-<td><a href="javascript:eval(hr[113]);" onMouseOver="display(dt[113],db[113]);"><img width="43" height="20" border="0" name="b113" src="empty.gif" /></a></td>
+<td><a name="link111" href="javascript:eval(hr[111]);" onMouseOver="display(dt[111],db[111]);"><img width="43" height="20" border="0" name="b111" src="empty.gif" /></a></td>
+<td><a name="link112" href="javascript:eval(hr[112]);" onMouseOver="display(dt[112],db[112]);"><img width="43" height="20" border="0" name="b112" src="empty.gif" /></a></td>
+<td><a name="link113" href="javascript:eval(hr[113]);" onMouseOver="display(dt[113],db[113]);"><img width="43" height="20" border="0" name="b113" src="empty.gif" /></a></td>
 </tr>
 
 </table>
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.29 loncom/interface/lonmenu.pm:1.30
--- loncom/interface/lonmenu.pm:1.29	Fri Dec  6 12:49:49 2002
+++ loncom/interface/lonmenu.pm	Wed Jan 15 18:59:26 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.29 2002/12/06 17:49:49 matthew Exp $
+# $Id: lonmenu.pm,v 1.30 2003/01/15 23:59:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,11 +38,21 @@
 use Apache::lonnet;
 use Apache::File;
 use vars qw(@desklines $readdesk);
- 
+
+# ================================================================= Reopen menu
+
+sub reopenmenu {
+   my $nothing='';
+   my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
+   if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
+   return('window.open("'.$nothing.'","'.$menuname.'","",false);');
+} 
+
 # =============================================================== Open the menu
 
 sub open {
     my $returnval='';
+    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     unless (shift eq 'unix') {
 # resizing does not work on linux because of virtual desktop sizes
        $returnval.=(<<ENDRESIZE);
@@ -53,7 +63,7 @@
 ENDRESIZE
     }
     $returnval.=(<<ENDOPEN);
-var menu=window.open("/res/adm/pages/menu.html","LONCAPAmenu",
+var menu=window.open("/res/adm/pages/menu.html","$menuname",
 "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
 ENDOPEN
     return '<script>'.$returnval.'</script>';
@@ -104,10 +114,11 @@
 }
 
 sub openmenu {
+    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     if ($ENV{'browser.type'} eq 'explorer') {
-       return "window.open('javascript:void(0);','LONCAPAmenu');";
+       return "window.open('javascript:void(0);','".$menuname."');";
    } else {
-       return "window.open('','LONCAPAmenu');";
+       return "window.open('','".$menuname."');";
    }
 }
 
@@ -187,9 +198,10 @@
 # ======================================================================= Close
 
 sub close {
+    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     return(<<ENDCLOSE);
 <script>
-menu=window.open("/adm/rat/empty.html","LONCAPAmenu",
+menu=window.open("/adm/rat/empty.html","$menuname",
                  "height=350,width=150,scrollbars=no,menubar=no");
 menu.close();
 </script>
@@ -221,6 +233,7 @@
    $readdesk='done';
   }
 }
+
 1;
 __END__
 
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.224 loncom/xml/lonxml.pm:1.225
--- loncom/xml/lonxml.pm:1.224	Mon Jan 13 17:18:34 2003
+++ loncom/xml/lonxml.pm	Wed Jan 15 18:59:27 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.224 2003/01/13 22:18:34 albertel Exp $
+# $Id: lonxml.pm,v 1.225 2003/01/15 23:59:27 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -408,8 +408,7 @@
     }
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }
     $Apache::lonxml::registered=1;
-    my $nothing='';
-    if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
+    my $reopen=&Apache::lonmenu::reopenmenu();
     my $newmail='';
     if (&Apache::lonmsg::newmail()) { 
        $newmail='menu.setstatus("you have","messages");';
@@ -499,7 +498,7 @@
 // BEGIN LON-CAPA Internal
 
     function LONCAPAreg() {
-	  menu=window.open("$nothing","LONCAPAmenu","",false);
+	  menu=$reopen;
           menu.clearTimeout(menu.menucltim);
           $timesync
           $newmail
@@ -510,7 +509,7 @@
           menu.currentStale=0;
           menu.clearbut(3,1);
           menu.switchbutton
-       (6,3,'catalog.gif','catalog','info','catalog_info()');
+       (6,3,'catalog.gif','catalog','info','catalog_info()','Show catalog information');
           menu.switchbutton
        (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)','Provide my evaluation of this resource');
           menu.switchbutton
@@ -532,7 +531,7 @@
     }
 
     function LONCAPAstale() {
-	  menu=window.open("$nothing","LONCAPAmenu","",false);
+	  menu=$reopen
           menu.currentStale=1;
           if (menu.reloadURL!='' && menu.reloadURL!= null) { 
              menu.switchbutton
@@ -559,7 +558,7 @@
 // BEGIN LON-CAPA Internal
 
     function LONCAPAreg() {
-	  menu=window.open("$nothing","LONCAPAmenu","",false);
+	  menu=$reopen
           $timesync
           menu.currentStale=1;
           menu.clearbut(2,1);

--www1042675167--