--- loncom/interface/lonwishlist.pm	2011/01/27 14:38:44	1.9
+++ loncom/interface/lonwishlist.pm	2012/05/22 16:31:38	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility-routines for wishlist
 #
-# $Id: lonwishlist.pm,v 1.9 2011/01/27 14:38:44 wenzelju Exp $
+# $Id: lonwishlist.pm,v 1.14 2012/05/22 16:31:38 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -478,6 +478,16 @@ sub getNodesToArray {
      Calls &wishlistView(nodes), &wishlistEdit(nodes) or &wishlistMove(nodes, marked).
  
 
+=item * &makePopUpNewLink(title, path)
+
+     Returns the HTML-markup for the pop-up-window 'Add Link'. If this is called up from a browsed resource, the input-fields titel and path are pre-filled with the resources' meta-data-title and it's path. 
+
+
+=item * &makePopUpNewFolder()
+
+     Returns the HTML-markup for the pop-up-window 'Add Folder'.
+
+
 =item * &makePageSet()
 
      Returns the HTML-Markup for the page shown when a link was set by using the icon when viewing a resource.
@@ -501,7 +511,7 @@ sub getNodesToArray {
 # Return a script-tag containing Javascript-function
 # needed for wishlist actions like 'new link' ect.
 sub JSforWishlist {
-    my $startPagePopup = &Apache::loncommon::start_page('Wishlist',undef,
+    my $startPagePopup = &Apache::loncommon::start_page('Stored Links',undef,
                                                             {'only_body' => 1,
                                                              'js_ready'  => 1,
                                                              'bgcolor'   => '#FFFFFF',});
@@ -511,65 +521,6 @@ sub JSforWishlist {
     &getFoldersToArray(\@childrenRt);
     &getFoldersForOption(\@childrenRt);
 
-    # texthash
-    my %lt = &Apache::lonlocal::texthash(
-                 'nl' => 'New Link',
-                 'nf' => 'New Folder',
-                 'lt' => 'Link Title',
-                 'ft' => 'Folder Title',
-                 'pa' => 'Path',
-                 'nt' => 'Note',
-                 'si' => 'Save in',
-                 'cl' => 'Cancel');
-
-
-    my $inPageNewLink = '<h1>'.$lt{'nl'}.'</h1>'.
-                        '<form method="post" name="newlink" action="/adm/wishlist" target="wishlist" '.
-                        'onsubmit="return newlinksubmit();" >'.
-                        &Apache::lonhtmlcommon::start_pick_box().
-                        &Apache::lonhtmlcommon::row_title($lt{'lt'}).
-                        '<input type="text" name="title" size="45" value="" />'.
-                        &Apache::lonhtmlcommon::row_closure().
-                        &Apache::lonhtmlcommon::row_title($lt{'pa'}).
-                        '<input type="text" name="path" size="45" value="" />'.
-                        &Apache::lonhtmlcommon::row_closure().
-                        &Apache::lonhtmlcommon::row_title($lt{'nt'}).
-                        '<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="'.$lt{'si'}.'" />'.
-                        '<select name="folders">'.
-                        '<option value="" selected="selected">('.&mt('Top level').')</option>'.
-                        $foldersOption.
-                        '</select>'.
-                        '<input type="button" value="'.$lt{'cl'}.'" onclick="javascript:window.close();" />'.
-                        '</form>';
-    
-    my $inPageNewFolder = '<h1>'.$lt{'nf'}.'</h1>'.
-                          '<form method="post" name="newfolder" action="/adm/wishlist" target="wishlist" '.
-                          'onsubmit="return newfoldersubmit();" >'.
-                          &Apache::lonhtmlcommon::start_pick_box().
-                          &Apache::lonhtmlcommon::row_title($lt{'ft'}).
-                          '<input type="text" name="title" size="45" value="" /><br />'.
-                          &Apache::lonhtmlcommon::row_closure().
-                          &Apache::lonhtmlcommon::row_title($lt{'nt'}).
-                          '<textarea name="note" rows="3" cols="35" style="width:100%"></textarea><br />'.
-                          &Apache::lonhtmlcommon::row_closure(1).
-                          &Apache::lonhtmlcommon::end_pick_box().
-                          '<br/><br/>'.
-                          '<input type="submit" value="'.$lt{'si'}.'" />'.
-                          '<select name="folders">'.
-                          '<option value="" selected="selected">('.&mt('Top level').')</option>'.
-                          $foldersOption.
-                          '</select>'.
-                          '<input type="button" value="'.$lt{'cl'}.'" onclick="javascript:window.close();" />'.
-                          '</form>';
-
-    # Remove all \n for inserting on javascript document.write
-    $inPageNewLink =~ s/\n//g;
-    $inPageNewFolder =~ s/\n//g;
-
     # it is checked, wether a path links to a LON-CAPA-resource or an external website. links to course-contents are not allowed
     # because they probably will return a kind of 'no access' (unless the user is already in the course, the path links to).
     # also importing these kind of links into a course does not make much sense.
@@ -577,63 +528,27 @@ sub JSforWishlist {
     # that means that it is checked wether a path contains .problem, .quiz, .exam etc.
     # this is good for most cases but crashes as soon as a real external website contains one of this pattern in its URL.
     # so maybe there's a better way to find out wether a given URL belongs to a LON-CAPA-server or not ...?
-    my $warningLinkNotAllowed1 = &mt('You can only insert links to LON-CAPA resources from the resource-pool '.
-                                    'or to external websites. Paths to LON-CAPA resources must be of the form /res/dom/usr... . '.
-                                    'Paths to external websites must contain the network protocol (e.g. http://...).');
-    my $warningLinkNotAllowed2 = &mt('The following link is not allowed: ');
+    my $warningLinkNotAllowed1 =
+        &mt('You can only insert links to LON-CAPA resources from the resource-pool'.
+            ' or to external websites.'.
+            ' Paths to LON-CAPA resources must be of the form /res/domain/user/...'.
+            ' Paths to external websites must contain the network protocol, e.g. http://...');
+    my $warningLinkNotAllowed2 = &mt('The following link is not allowed:').' ';
     my $warningLink = &mt('You must insert a title and a path!');
     my $warningFolder = &mt('You must insert a title!');
     my $warningDelete = &mt('Are you sure you want to delete the selected entries? Deleting a folder also deletes all entries within this folder!');
-    my $warningSave = &mt('You have unsaved changes. You can either save these changes now by clicking "ok" or click "cancel" if you do not want to save your changes.');
+    my $warningSave = &mt('You have unsaved changes. You can either save these changes now by clicking "OK" or click "Cancel" if you do not want to save your changes.');
     my $warningMoveS = &mt('You must select at minimum one entry to move!');
     my $warningMoveD = &mt('You must select a destination folder!');
     $foldersOption = '';
 
     my $js = &Apache::lonhtmlcommon::scripttag(<<JAVASCRIPT);
     function newLink() {
-        newlinkWin=window.open('','newlinkWin','width=580,height=320,scrollbars=yes');
-        newlinkWin.document.write('$startPagePopup' 
-                              +'<script type="text\/javascript">'
-                              +'function newlinksubmit(){'
-                              +'var path = document.getElementsByName("path")[0].value;'
-                              +'var title = document.getElementsByName("title")[0].value;'
-                              +'if (!path || !title) {'
-                              +'alert("$warningLink");'
-                              +'return false;}'
-                              +'var linkOK = (path.match(/^http:(\\\\/\\\\/)/) || path.match(/^https:(\\\\/\\\\/)/))'
-                              +'&& !(path.match(/\\.problem/) || path.match(/\\.exam/)'
-                              +'|| path.match(/\\.quiz/) || path.match(/\\.assess/)'
-                              +'|| path.match(/\\.survey/) || path.match(/\\.form/)'
-                              +'|| path.match(/\\.library/) || path.match(/\\.page/)'
-                              +'|| path.match(/\\.sequence/));'
-                              +'if (!path.match(/^(\\\\/res\\\\/)/) && !linkOK) {'
-                              +'alert("$warningLinkNotAllowed1");'
-                              +'return false;}'
-                              +'else {'
-                              +'window.close();'
-                              +'return true;}}'
-                              +'<\/scr'+'ipt>'
-                              +'$inPageNewLink'
-                              +'$endPagePopup');
-        newlinkWin.document.close();
+        newlinkWin=window.open('/adm/wishlist?mode=newLink','newlinkWin','width=580,height=350, scrollbars=yes');
     }
 
     function newFolder() {
-        newfolderWin=window.open('','newfolderWin','width=580,height=270, scrollbars=yes');
-        newfolderWin.document.write('$startPagePopup' 
-                              +'<script type="text\/javascript">'
-                              +'function newfoldersubmit(){'
-                              +'var title = document.getElementsByName("title")[0].value;'
-                              +'if (!title) {'
-                              +'alert("$warningFolder");'
-                              +'return false;}'
-                              +'else {'
-                              +'window.close();'
-                              +'return true;}}'
-                              +'<\/scr'+'ipt>'
-                              +'$inPageNewFolder'
-                              +'$endPagePopup');
-        newfolderWin.document.close();
+        newfolderWin=window.open('/adm/wishlist?mode=newFolder','newfolderWin','width=580,height=270, scrollbars=yes');
     }
 
     function setFormAction(action,mode) {
@@ -1190,7 +1105,7 @@ sub wishlistView {
  
         # checkboxes
         $wishlistHTMLview .= '<td><input type="checkbox" name="mark" id="check'.$index.'" value="'.$index.'" '.
-                             'onclick="selectAction('."'row".$index."'".')"/></td>';
+                             'onclick="selectAction('."'row".$index."'".')" /></td>';
 
         # entry is a folder
         if ($n->value()->path() eq '') {
@@ -1258,7 +1173,7 @@ sub wishlistEdit {
 
         # checkboxes
         $wishlistHTMLedit .= '<td><input type="checkbox" name="mark" id="check'.$index.'" value="'.$index.'" '.
-                             'onclick="selectAction('."'row".$index."'".')"/></td>';
+                             'onclick="selectAction('."'row".$index."'".')" /></td>';
 
         # option-tags for sorting entries. we need the numbers from 1 to n with n being the number of entries on the same level as the current entry.
         # set the number for the current entry into brackets 
@@ -1281,7 +1196,7 @@ sub wishlistEdit {
                                  '<a href="javascript:;" onclick="folderAction('."'row".$index."'".')" style="vertical-align:top" >'.
                                  '<img src="/adm/lonIcons/arrow.closed.gif" id="img'.$index.'" alt = ""  class="LC_icon"/>'.
                                  '<img src="/adm/lonIcons/navmap.folder.closed.gif" id="imgFolder'.$index.'" alt="folder"/></a>'.
-                                 '<input type="text" name="newtitle" value="'.$n->value()->title().'" alt = "'.$n->value()->title().'"/>'.
+                                 '<input type="text" name="newtitle" value="'.$n->value()->title().'" alt = "'.$n->value()->title().'" />'.
                                  '</td><td></td>';
 
         }
@@ -1291,8 +1206,8 @@ sub wishlistEdit {
                                  $options.'</select></td>'.
                                  '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<=0?$indentConst:$indent).'px;">'.
                                  '<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link"/>'.
-                                 '<input type="text" name="newtitle" value="'.$n->value()->title().'" alt = "'.$n->value()->title().'"/></td>'.
-                                 '<td><input type="text" name="newpath" value="'.$n->value()->path().'" alt = "'.$n->value()->path().'"/></td>';
+                                 '<input type="text" name="newtitle" value="'.$n->value()->title().'" alt = "'.$n->value()->title().'" /></td>'.
+                                 '<td><input type="text" name="newpath" value="'.$n->value()->path().'" alt = "'.$n->value()->path().'" /></td>';
         }
         
         # note-icon, different icons for an entries with note and those without
@@ -1357,7 +1272,7 @@ sub wishlistMove {
                 $wishlistHTMLmove .= '<td><input type="radio" name="mark" id="radio'.$index.'" value="'.$index.'" /></td>'.
                                      '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px; min-width: 220px;">';
             }
-            # higlight the title, if the folder was selected to be moved
+            # highlight the title, if the folder was selected to be moved
             else {
                 $wishlistHTMLmove .= '<td></td>'.
                                      '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px; min-width: 220px;'.
@@ -1435,10 +1350,10 @@ sub wishlistImport {
         # checkboxes
         $wishlistHTMLimport .= '<td>'.
                                '<input type="checkbox" name="check" id="check'.$index.'" value="'.$index.'" '.
-                               'onclick="selectAction('."'row".$index."'".')"/>'.
-                               '<input type="hidden" name="title'.$index.'" value="'.&escape($n->value()->title()).'">'.
-                               '<input type="hidden" name="filelink'.$index.'" value="'.&escape($n->value()->path()).'">'.
-                               '<input type="hidden" name="id'.$index.'">'.
+                               'onclick="selectAction('."'row".$index."'".')" />'.
+                               '<input type="hidden" name="title'.$index.'" value="'.&escape($n->value()->title()).'" />'.
+                               '<input type="hidden" name="filelink'.$index.'" value="'.&escape($n->value()->path()).'" />'.
+                               '<input type="hidden" name="id'.$index.'" />'.
                                '</td>';
 
         # entry is a folder
@@ -1502,13 +1417,13 @@ sub makePage {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb(
               { href => '/adm/wishlist?mode='.$mode,
-                text => 'Wishlist'});
-    my $startPage = &Apache::loncommon::start_page('Wishlist',undef,
+                text => 'Stored Links'});
+    my $startPage = &Apache::loncommon::start_page('Stored Links',undef,
                                                      {'add_entries' => {
                                                         'onload' => 'javascript:onLoadAction('."'".$mode."'".');',
                                                         'onunload' => 'javascript:window.name = '."'loncapaclient'"}});
 
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Wishlist').&Apache::loncommon::help_open_topic('Wishlist'));
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Stored Links').&Apache::loncommon::help_open_topic('Wishlist'));
 
     # get javascript-code for wishlist-interactions
     my $js = &JSforWishlist();
@@ -1584,7 +1499,7 @@ sub makePage {
 
     # start form 
     my $inner .= '<form name="list" action ="/adm/wishlist" method="post">'.
-                 '<input type="hidden" id="action" name="action" value=""/>';
+                 '<input type="hidden" id="action" name="action" value="" />';
  
     # only display subbox in view- or edit-mode
     if ($mode eq 'view' || $mode eq 'edit') {
@@ -1600,7 +1515,7 @@ sub makePage {
             $inner .= &Apache::loncommon::end_data_table();
         }
         else {
-            $inner .= '<span class="LC_info">'.&mt("Your wishlist ist currently empty.").'</span>';
+            $inner .= '<span class="LC_info">'.&mt("Your Stored Links list is currently empty.").'</span>';
         }
         $wishlistHTMLedit = '';
     }
@@ -1610,7 +1525,7 @@ sub makePage {
             $inner .= '<table class="LC_data_table LC_tableOfContent">'.$wishlistHTMLview.'</table>';
         }
         else {
-            $inner .= '<span class="LC_info">'.&mt("Your wishlist ist currently empty.").'</span>';
+            $inner .= '<span class="LC_info">'.&mt("Your Stored Links list is currently empty.").'</span>';
         }
         $wishlistHTMLview = '';
     }
@@ -1621,20 +1536,20 @@ sub makePage {
         }
         if ($markStr) {
             $markStr = substr($markStr, 0, length($markStr)-1);
-            $inner .= '<input type="hidden" value="'.$markStr.'" name="markedToMove"/>';
+            $inner .= '<input type="hidden" value="'.$markStr.'" name="markedToMove" />';
             $inner .= '<p><span class="LC_info">'.&mt('You have selected the red marked entries to be moved to another folder. '.
                                                    'Now choose the new destination folder.').'</span></p>';
             &wishlistMove(\@childrenRt, $marked);
             $inner .= '<table class="LC_data_table LC_tableOfContent">'.$wishlistHTMLmove.'</table><br/><br/>';
-            $inner .= '<input type="button" value="'.&mt('Move').'" onclick="setFormAction('."'move','view'".');"/>'.
-                      '<input type="button" value="'.&mt('Cancel').'" onclick="go('."'/adm/wishlist'".')"/>';
+            $inner .= '<input type="button" value="'.&mt('Move').'" onclick="setFormAction('."'move','view'".');" />'.
+                      '<input type="button" value="'.&mt('Cancel').'" onclick="go('."'/adm/wishlist'".')" />';
 
             $wishlistHTMLmove ='<tr id="root" class="LC_odd_row"><td><input type="radio" name="mark" id="radioRoot" value="root" /></td>'.
                                '<td>'.&mt('Top level').'</td><td></td></tr>';
         }
         else {
             $inner .= '<p><span class="LC_info">'.&mt("You haven't marked any entry to move.").'</span></p>'.
-                      '<input type="button" value="'.&mt('Back').'" onclick="go('."'/adm/wishlist'".')"/>';
+                      '<input type="button" value="'.&mt('Back').'" onclick="go('."'/adm/wishlist'".')" />';
         }
     }
     
@@ -1653,7 +1568,8 @@ sub makePage {
 
 # Returns the HTML-Markup for the PopUp, shown when a new link should set, when NOT
 # beeing in the wishlist-interface (method is called in lonmenu and lonsearchcat)
-sub makePopUpNewLink{
+sub makePopUpNewLink {
+    my ($title, $path) = @_;
 
     # Get all existing folders to offer posibility to set a new link
     # into a folder
@@ -1670,97 +1586,177 @@ sub makePopUpNewLink{
     $foldersOption = '';
     @allFolders = ();
 
-    # 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 $start_page_wishlistlink = 
-        &Apache::loncommon::start_page('Set link to wishlist',undef,
-				       {'only_body' => 1,
-					'js_ready'  => 1,
-					'bgcolor'   => '#FFFFFF',});
+    # HTML-Markup for the Pop-Up-window 'Set a link for this resource to wishlist'
+    my $startPageWishlistlink = 
+        &Apache::loncommon::start_page('Save to Stored Links',undef,
+                                      {'only_body' => 1,
+                                       'bgcolor'   => '#FFFFFF',});
 
     my $warningLink = &mt('You must insert a title!');
+    my $warningLinkNotAllowed1 =
+        &mt('You can only insert links to LON-CAPA resources from the resource-pool'.
+            ' or to external websites.'.
+            ' Paths to LON-CAPA resources must be of the form /res/domain/user/...'.
+            ' Paths to external websites must contain the network protocol, e.g. http://...');
+
+    my $inPageWishlistlink1 = '<h1>'.&mt('Save to Stored Links').'</h1>';
+    # If no title is delivered, 'New Link' is called up from the wishlist-interface, so after
+    # submitting the window should close instead of offering a link to wishlist (like it should do
+    # if we call 'Set New Link' from within a browsed ressource)
+    if (!$title) {
+        $inPageWishlistlink1 .= '<form method="post" name="newlink" action="/adm/wishlist" target="wishlist"'.
+                                'onsubmit="return newlinksubmit();" >';
+    }
+    else {
+        $inPageWishlistlink1 .= '<form method="post" name="newlink" action="/adm/wishlist?mode=set" '.
+                                'onsubmit="return newlinksubmit();" >';
+    }
+    $inPageWishlistlink1 .= &Apache::lonhtmlcommon::start_pick_box().
+                            &Apache::lonhtmlcommon::row_title(&mt('Link Title'));
+
+    my $inPageWishlistlink2 = &Apache::lonhtmlcommon::row_closure().
+                              &Apache::lonhtmlcommon::row_title(&mt('Path'));
 
-    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">'.
-                                $options.
-                                '</select>'.
-                                '<input type="button" value="'.&mt('cancel').'" onclick="javascript:window.close();" />'.
-                                '</form>';
+    my $inPageWishlistlink3 = &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">'.
+                              $options.
+                              '</select>'.
+                              '<input type="button" value="'.&mt('Cancel').'" onclick="javascript:window.close();" />'.
+                              '</form>';
     $options = '';
 
-    # 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});
-
-    # Add JavaScript-function to set link for a ressource to wishlist
-    my $js.=<<SCRIPT;
-    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();
+    my $endPageWishlistlink = &Apache::loncommon::end_page();
+
+    my $popUp = $startPageWishlistlink.
+    $inPageWishlistlink1.
+    '<input type="text" name="title" size="45" value="" />'.
+    $inPageWishlistlink2.
+    '<input type="text" name="path" size="45" value="" />'.
+    $inPageWishlistlink3;
+
+    # JavaScript-function to set title and path of ressource automatically
+    # and show warning, if no title was set or path is invalid
+    $popUp .= <<SCRIPT;
+    <script type="text\/javascript">
+    document.getElementsByName("title")[0].value = '$title';
+    document.getElementsByName("path")[0].value = '$path';
+    var fromwishlist = false;
+    var titleget = '$title';
+    if (!titleget) {
+        fromwishlist = true;
+    } 
+    function newlinksubmit(){
+    var title = document.getElementsByName("title")[0].value;
+    var path = document.getElementsByName("path")[0].value;
+    if (!title) {
+        alert("$warningLink");
+        return false;}
+    var linkOK = (path.match(/\^http:(\\\/\\\/)/) || path.match(/\^https:(\\\/\\\/)/))
+    && !(path.match(/\\.problem/) || path.match(/\\.exam/)
+    || path.match(/\\.quiz/) || path.match(/\\.assess/)
+    || path.match(/\\.survey/) || path.match(/\\.form/)
+    || path.match(/\\.library/) || path.match(/\\.page/)
+    || path.match(/\\.sequence/));
+    if (!path.match(/\^(\\\/res\\\/)/) && !linkOK) {
+        alert("$warningLinkNotAllowed1");
+        return false;}
+    if (fromwishlist) {
+        window.close();
+    }
+    return true;}
+    <\/script>
 SCRIPT
 
-    return $js;
+    $popUp .= $endPageWishlistlink;
+
+    return $popUp;
+}
+
+sub makePopUpNewFolder {
+    # Get all existing folders to offer posibility to create a new folder
+    # into an existing folder
+    my %TreeHashLink = &Apache::lonwishlist::getWishlist();
+    my $rootLink = &Apache::Tree::HashToTree(\%TreeHashLink);
+    my @childrenRtLink = $rootLink->children();
+
+    $foldersOption = '';
+    @allFolders = ();
+    &getFoldersToArray(\@childrenRtLink);
+    &getFoldersForOption(\@childrenRtLink);
+
+    my $options = '<option value="" selected="selected">('.&mt('Top level').')</option>'.$foldersOption;
+    $foldersOption = '';
+    @allFolders = ();
+
+    # HTML-Markup for the Pop-Up-window 'New Folder'
+    my $startPageWishlistfolder = 
+        &Apache::loncommon::start_page('New Folder',undef,
+                                      {'only_body' => 1,
+                                       'bgcolor'   => '#FFFFFF',});
+
+    my $warningFolder = &mt('You must insert a title!');
+
+
+    my $inPageNewFolder = '<h1>'.&mt('New Folder').'</h1>'.
+                          '<form method="post" name="newfolder" action="/adm/wishlist" target="wishlist" '.
+                          'onsubmit="return newfoldersubmit();" >'.
+                          &Apache::lonhtmlcommon::start_pick_box().
+                          &Apache::lonhtmlcommon::row_title(&mt('Folder title')).
+                          '<input type="text" name="title" size="45" value="" /><br />'.
+                          &Apache::lonhtmlcommon::row_closure().
+                          &Apache::lonhtmlcommon::row_title(&mt('Note')).
+                          '<textarea name="note" rows="3" cols="35" style="width:100%"></textarea><br />'.
+                          &Apache::lonhtmlcommon::row_closure(1).
+                          &Apache::lonhtmlcommon::end_pick_box().
+                          '<br/><br/>'.
+                          '<input type="submit" value="'.&mt('Save in').'" />'.
+                          '<select name="folders">'.
+                          $options.
+                          '</select>'.
+                          '<input type="button" value="'.&mt('Cancel').'" onclick="javascript:window.close();" />'.
+                          '</form>';
+    my $endPageWishlistfolder = &Apache::loncommon::end_page();
+
+    my $popUp = $startPageWishlistfolder.
+    $inPageNewFolder;
+
+    $popUp .= <<SCRIPT;
+    <script type="text\/javascript">
+        function newfoldersubmit(){
+            var title = document.getElementsByName("title")[0].value;
+            if (!title) {
+            alert("$warningFolder");
+            return false;}
+            else {
+            window.close();
+            return true;}}
+    <\/script>
+SCRIPT
+
+    $popUp .= $endPageWishlistfolder;
+
+    return $popUp;
 }
 
 # Returns the HTML-Markup for the page, shown when a link was set
 sub makePageSet {
     # start_page 
-    my $startPage = &Apache::loncommon::start_page('Wishlist',undef,
+    my $startPage = &Apache::loncommon::start_page('Stored Links',undef,
                                                    {'only_body' => 1});
     
     # confirm success and offer link to wishlist
-    my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Link successfully set!'));
+    my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Link successfully saved!'));
     $message = &Apache::loncommon::confirmwrapper($message);
 
     my $inner .= '<br>'.$message.'<br/><br/>'.
-                 '<a href="javascript:;" onclick="opener.open('."'/adm/wishlist'".');window.close();">'.&mt('Go to wishlist').'</a>'.
-                 '&nbsp;<a href="javascript:;" onclick="window.close();">'.&mt('Close this window').'</a>';
+                 '<a href="javascript:;" onclick="opener.open('."'/adm/wishlist'".');window.close();">'.&mt('Go to Stored Links').'</a>'.('&nbsp;' x 3).
+                 '<a href="javascript:;" onclick="window.close();">'.&mt('Close this window').'</a>';
 
     # end_page 
     my $endPage =  &Apache::loncommon::end_page();
@@ -1780,23 +1776,30 @@ sub makePageImport {
     $root = $rootgiven;
     @childrenRt = $root->children();
     # start_page 
-    my $startPage = &Apache::loncommon::start_page('Wishlist',undef,
+    my $startPage = &Apache::loncommon::start_page('Stored Links',undef,
                                                    {'only_body' => 1});
     
     # get javascript-code for wishlist-interactions
     my $js = &JSforWishlist();
     $js .= &JSforImport($rat);
 
-    my $inner = '<h1>'.&mt('Import Resources from Wishlist').'</h1>';
+    my $inner = '<h1>'.&mt('Import Resources from Stored Links').'</h1>';
     if (!$rat) {
-        $inner .= '<p><span class="LC_info">'.&mt("Please note that you  can use the checkboxes corresponding to a folder to ".
-                                                  "easily check all links within this folder. The folder structure itself can't be imported. ".
-                                                  "All checked links will be imported into the current folder of your course.").'</span></p>';
+        $inner .=
+            '<p class="LC_info">'.
+            &mt('Please note that you can use the checkboxes corresponding to a folder to '.
+                'easily check all links within this folder.'.
+                ' The folder structure itself cannot be imported.').
+            ' '.&mt('All checked links will be imported into the current folder of your course.').
+            '</p>';
     }
     else {
-        $inner .= '<p><span class="LC_info">'.&mt("Please note that you  can use the checkboxes corresponding to a folder to ".
-                                                  "easily check all links within this folder. The folder structure itself can't be imported. ")
-                                                  .'</span></p>';
+        $inner .=
+            '<p class="LC_info">'.
+            &mt('Please note that you can use the checkboxes corresponding to a folder to '.
+                'easily check all links within this folder.'.
+                ' The folder structure itself cannot be imported.').
+            '</p>';
     }
     my %wishlist = &getWishlist();
 
@@ -1812,12 +1815,12 @@ sub makePageImport {
         $fnum = (keys %wishlist)-1;
     }
 
-    $inner .= '<form method="post" name="groupsort">'.
-              '<input type="hidden" value="'.$fnum.'" name="fnum">'.
-              '<input type="button" onclick="javascript:checkAll()" id="checkallbutton" value="'.&mt('Check All').'">'.
-              '<input type="button" onclick="javascript:uncheckAll()" id="uncheckallbutton" value="'.&mt('Uncheck All').'">'.
-              '<input type="button" value="'.&mt('Import Checked').'" onclick="finish_import();">'.    
-              '<input type="button" value="'.&mt('Cancel').'" onclick="window.close();"><br/><br/>'; 
+    $inner .= '<form method="post" name="groupsort" action="">'.
+              '<input type="hidden" value="'.$fnum.'" name="fnum" />'.
+              '<input type="button" onclick="javascript:checkAll()" id="checkallbutton" value="'.&mt('Check All').'" />'.
+              '<input type="button" onclick="javascript:uncheckAll()" id="uncheckallbutton" value="'.&mt('Uncheck All').'" />'.
+              '<input type="button" value="'.&mt('Import Checked').'" onclick="finish_import();" />'.    
+              '<input type="button" value="'.&mt('Cancel').'" onclick="window.close();" /><br/><br/>'; 
 
     
     # wishlist-table
@@ -1826,7 +1829,7 @@ sub makePageImport {
         $inner .= '<table class="LC_data_table LC_tableOfContent">'.$wishlistHTMLimport.'</table>';
     }
     else {
-        $inner .= '<span class="LC_info">'.&mt("Your wishlist ist currently empty.").'</span>';
+        $inner .= '<span class="LC_info">'.&mt("Your Stored Links list is currently empty.").'</span>';
     }
     $wishlistHTMLimport = '';
 
@@ -1848,9 +1851,9 @@ sub makeErrorPage {
     &Apache::lonhtmlcommon::add_breadcrumb(
               { href => '/adm/wishlist',
                 text => 'Wishlist'});
-    my $startPage = &Apache::loncommon::start_page('Wishlist');
+    my $startPage = &Apache::loncommon::start_page('Stored Links');
     
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Wishlist').&Apache::loncommon::help_open_topic('Wishlist'));
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Stored Links').&Apache::loncommon::help_open_topic('Wishlist'));
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
     # error-message