--- loncom/html/res/adm/pages/menu.html	2010/03/10 21:25:44	1.129
+++ loncom/html/res/adm/pages/menu.html	2012/08/04 16:37:49	1.130
@@ -4,7 +4,7 @@ The LearningOnline Network with CAPA
 Remote Control
 
 //
-// $Id: menu.html,v 1.129 2010/03/10 21:25:44 droeschl dead $
+// $Id: menu.html,v 1.130 2012/08/04 16:37:49 raeburn Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -203,18 +203,20 @@ function defdis() {
 }
 
 function switchbutton(row,col,imgsrc,texttop,textbot,action,desc) {
-   var idx=10*row+col;
-   this.document['b'+idx].src=imgpath+imgsrc;
-   hr[idx]=action;
-   dt[idx]=texttop;
-   db[idx]=textbot;
-   ds[idx]=desc;
-   for (var k=0;k<document.links.length;k++) {
-       if (document.links[k].name=='link'+idx) {
-          document.links[k].title=desc;
-       }
-   }
-} 
+    var idx=10*row+col;
+    if (typeof(this.document['b'+idx]) == 'object') {
+        this.document['b'+idx].src=imgpath+imgsrc;
+        hr[idx]=action;
+        dt[idx]=texttop;
+        db[idx]=textbot;
+        ds[idx]=desc;
+        for (var k=0;k<document.links.length;k++) {
+            if (document.links[k].name=='link'+idx) {
+                document.links[k].title=desc;
+            }
+        }
+    }
+}
 
 function clearbut(row,col) {
    var idx=10*row+col;
@@ -324,29 +326,19 @@ function annotate() {
    annotator.document.close();
 }
 
-function set_bookmark() {
-   go('');
-   if (currentStale) {
-      clienttitle="Enter Title";
-      clienthref=currentURL;
-   } else {
-      clienttitle=clientwindow.document.title;
-      clienthref=clientwindow.location.pathname;
-   }
-   w_bmquery_flag=1;
-   bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0');
-   bmquery.document.write(
-   '<html><body bgcolor="#BBBBBB"><center><form method="post"'
-   +' name="newlink" action="/adm/bookmarks" target="bmquery" '
-   +'>'+"\n"+' <table width="340" height="150" '
-   +'bgcolor="#FFFFFF" align="center"><tr><td>Link Name:<br /><input '
-   +'type="text" name="title" size="45" value="'+clienttitle+'">'
-   +'<br />Address:<br /><input type="text" name="address" size="45" '
-   +'value="'+clienthref+'" /><br /><center><input type="submit" '
-   +'value="Save" /> <input type="button" value="Close" '
-   +'onclick="javascript:window.close();" /><\/center><\/td>'
-   +'<\/tr><\/table><\/form><\/center><\/body><\/html>');
-   bmquery.document.close();
+function set_wishlistlink() {
+    go('');
+    var title;
+    var path;
+    if (currentStale) {
+        title="Enter Title";
+        path=currentURL;
+    } else {
+        title=clientwindow.document.title;
+        path=clientwindow.location.pathname;
+    }
+    Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path,
+                      'wishlistNewLink','width=560,height=350,scrollbars=0');
 }
 
 function extenddispclose() {
