--- loncom/interface/lonmenu.pm	2011/01/18 19:52:46	1.344
+++ loncom/interface/lonmenu.pm	2011/02/15 14:54:51	1.347
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.344 2011/01/18 19:52:46 www Exp $
+# $Id: lonmenu.pm,v 1.347 2011/02/15 14:54:51 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -155,6 +155,7 @@ use Apache::lonenc();
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities();
+use Apache::lonwishlist();
 
 use vars qw(@desklines %category_names %category_members %category_positions 
             $readdesk @primary_menu @secondary_menu);
@@ -530,7 +531,7 @@ sub innerregister {
                         }
                     }
                     $editbutton=&switch
-                       ('','',6,1,'pcstr.png','edit[_1]','resource[_2]',
+                       ('','',6,1,'pcstr.png','Edit','resource[_2]',
                         $bot,"Edit this resource");
                     $noeditbutton = 0;
                 }
@@ -546,7 +547,7 @@ sub innerregister {
                         my $cfile = &edit_course_upload($file,$cnum,$cdom);
                         if ($cfile) {
                             $editbutton=&switch
-                                        ('','',6,1,'pcstr.png','edit[_1]',
+                                        ('','',6,1,'pcstr.png','Edit',
                                          'resource[_2]',"go('".$cfile."');",
                                          'Edit this resource');
                         }
@@ -1105,52 +1106,6 @@ sub utilityfunctions {
     my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
                          &mt('Switch server?');
 
-    my $start_page_wishlistlink = 
-        &Apache::loncommon::start_page('Set link to wishlist',undef,
-				       {'only_body' => 1,
-					'js_ready'  => 1,
-					'bgcolor'   => '#FFFFFF',});
-
-    my $warningLink = &mt('You must insert a title!');
-
-    # HTML-Markup for 'Set a link for this resource to wishlist'
-    # this is written via JavaScript document.write (function set_wishlistlink) 
-    # it is split into 3 parts and the inputfields for title and path are left out
-    # these fields are inserted later to set the values for title and path
-    # automatically via JavaScript (document.title and location.pathname) 
-    my %folders = &Apache::lonnet::get('wishlist',['folders']);
-    if ($folders{'folders'} eq '') {
-        $folders{'folders'} = '<option value="" selected="selected">('.&mt('Top level').')</option>';
-    }
-    my $in_page_wishlistlink1 = '<h1>'.&mt('Set a link to wishlist').'</h1>'.
-                                '<form method="post" name="newlink" action="/adm/wishlist?mode=set" '.
-                                'onsubmit="return newlinksubmit();" >'.
-                                &Apache::lonhtmlcommon::start_pick_box().
-                                &Apache::lonhtmlcommon::row_title(&mt('Link Title'));
-
-    my $in_page_wishlistlink2 = &Apache::lonhtmlcommon::row_closure().
-                                &Apache::lonhtmlcommon::row_title(&mt('Path'));
-
-    my $in_page_wishlistlink3 = &Apache::lonhtmlcommon::row_closure().
-                                &Apache::lonhtmlcommon::row_title(&mt('Note')).
-                                '<textarea name="note" rows="3" cols="35" style="width:100%"></textarea>'.
-                                &Apache::lonhtmlcommon::row_closure(1).
-                                &Apache::lonhtmlcommon::end_pick_box().
-                                '<br/><br/>'.
-                                '<input type="submit" value="'.&mt('Save in').'" />'.
-                                '<select name="folders">'.
-                                $folders{'folders'}.
-                                '</select>'.
-                                '<input type="button" value="'.&mt('cancel').'" onclick="javascript:window.close();" />'.
-                                '</form>';
-
-    # remove all \n for inserting on javascript document.write
-    $in_page_wishlistlink1 =~ s/\n//g;
-    $in_page_wishlistlink2 =~ s/\n//g;
-    $in_page_wishlistlink3 =~ s/\n//g;
-
-    my $end_page_wishlistlink = 
-        &Apache::loncommon::end_page({'js_ready' => 1});
 
 return (<<ENDUTILITY)
 
@@ -1276,32 +1231,15 @@ function annotate() {
 }
 
 function set_wishlistlink(title, path) {
-   if (!title) {
-       title=document.title;
-   }
-   if (!path) {
-       path=location.pathname;
-   }
-   title = title.replace(/^LON-CAPA /,'');
-   wishlistlink=window.open('','wishlistNewLink','width=560,height=350,scrollbars=0');
-   wishlistlink.document.write(
-   '$start_page_wishlistlink'
-   +'<script type="text\/javascript">'
-   +'function newlinksubmit(){'
-   +'var title = document.getElementsByName("title")[0].value;'
-   +'if (!title) {'
-   +'alert("$warningLink");'
-   +'return false;}'
-   +'return true;}'
-   +'<\/scr'+'ipt>'
-   +'$in_page_wishlistlink1'
-   +'<input type="text" name="title" size="45" value="'+title+'"/>'
-   +'$in_page_wishlistlink2'
-   +'<input type="text" name="path" size="45" value="'+path+'" '
-   +'readonly="readonly" style="background-color: #DDDDDD"/>'
-   +'$in_page_wishlistlink3'
-   +'$end_page_wishlistlink' );
-   wishlistlink.document.close();
+    if (!title) {
+        title = document.title;
+        title = title.replace(/^LON-CAPA /,'');
+    }
+    if (!path) {
+        path = location.pathname;
+    }
+    Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path,
+                      'wishlistNewLink','width=560,height=350,scrollbars=0');
 }
 
 function open_Wishlist_Import(rat) {