--- loncom/interface/lonwishlist.pm	2011/02/15 14:54:51	1.10
+++ loncom/interface/lonwishlist.pm	2012/05/16 11:26:03	1.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility-routines for wishlist
 #
-# $Id: lonwishlist.pm,v 1.10 2011/02/15 14:54:51 wenzelju Exp $
+# $Id: lonwishlist.pm,v 1.13 2012/05/16 11:26:03 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -511,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',});
@@ -1103,7 +1103,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 '') {
@@ -1171,7 +1171,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 
@@ -1194,7 +1194,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>';
 
         }
@@ -1204,8 +1204,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
@@ -1348,10 +1348,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
@@ -1415,13 +1415,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();
@@ -1497,7 +1497,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') {
@@ -1513,7 +1513,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 = '';
     }
@@ -1523,7 +1523,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 = '';
     }
@@ -1534,20 +1534,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'".')" />';
         }
     }
     
@@ -1586,7 +1586,7 @@ sub makePopUpNewLink {
 
     # HTML-Markup for the Pop-Up-window 'Set a link for this resource to wishlist'
     my $startPageWishlistlink = 
-        &Apache::loncommon::start_page('Set link to wishlist',undef,
+        &Apache::loncommon::start_page('Save to Stored Links',undef,
                                       {'only_body' => 1,
                                        'bgcolor'   => '#FFFFFF',});
 
@@ -1595,7 +1595,7 @@ sub makePopUpNewLink {
                                     '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 $inPageWishlistlink1 = '<h1>'.&mt('Set a link to wishlist').'</h1>';
+    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)
@@ -1631,9 +1631,9 @@ sub makePopUpNewLink {
 
     my $popUp = $startPageWishlistlink.
     $inPageWishlistlink1.
-    '<input type="text" name="title" size="45" value=""/>'.
+    '<input type="text" name="title" size="45" value="" />'.
     $inPageWishlistlink2.
-    '<input type="text" name="path" size="45" value=""/>'.
+    '<input type="text" name="path" size="45" value="" />'.
     $inPageWishlistlink3;
 
     # JavaScript-function to set title and path of ressource automatically
@@ -1743,16 +1743,16 @@ SCRIPT
 # 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();
@@ -1772,21 +1772,21 @@ 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 ".
+        $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>';
     }
     else {
-        $inner .= '<p><span class="LC_info">'.&mt("Please note that you  can use the checkboxes corresponding to a folder to ".
+        $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>';
     }
@@ -1804,12 +1804,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
@@ -1818,7 +1818,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 = '';
 
@@ -1840,9 +1840,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