--- loncom/interface/lonwishlist.pm	2012/05/14 16:39:41	1.11
+++ 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.11 2012/05/14 16:39:41 raeburn Exp $
+# $Id: lonwishlist.pm,v 1.14 2012/05/22 16:31:38 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',});
@@ -528,14 +528,16 @@ 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 = '';
@@ -1270,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;'.
@@ -1415,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();
@@ -1513,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 = '';
     }
@@ -1523,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 = '';
     }
@@ -1586,16 +1588,18 @@ 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',});
 
     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/dom/usr... . '.
-                                    'Paths to external websites must contain the network protocol (e.g. http://...).');
+    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('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)
@@ -1623,7 +1627,7 @@ sub makePopUpNewLink {
                               '<select name="folders">'.
                               $options.
                               '</select>'.
-                              '<input type="button" value="'.&mt('cancel').'" onclick="javascript:window.close();" />'.
+                              '<input type="button" value="'.&mt('Cancel').'" onclick="javascript:window.close();" />'.
                               '</form>';
     $options = '';
 
@@ -1743,16 +1747,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,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();
 
@@ -1818,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 = '';
 
@@ -1840,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