--- loncom/interface/lonwishlist.pm	2012/08/01 19:07:51	1.16
+++ loncom/interface/lonwishlist.pm	2014/02/28 19:24:03	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility-routines for wishlist
 #
-# $Id: lonwishlist.pm,v 1.16 2012/08/01 19:07:51 raeburn Exp $
+# $Id: lonwishlist.pm,v 1.21 2014/02/28 19:24:03 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -197,7 +197,7 @@ sub newEntry() {
     my $date = gmtime();
     # Create Entry-Object
     my $entry = Entry->new(title => $title, path => $path, note => $note, date => $date);
-    # Create Tree-Object, this correspones a node in the wishlist-tree
+    # Create Tree-Object, this corresponds a node in the wishlist-tree
     my $tree = Tree->new($entry);
     # Add this node to wishlist-tree
     my $folderIndex = $env{'form.folders'};
@@ -1042,6 +1042,12 @@ sub JSforImport{
         function finish_import() {
             opener.document.forms.simpleedit.importdetail.value='';
             for (var num = 0; num < document.forms.groupsort.fnum.value; num++) {
+                try {
+                    eval("document.forms.groupsort.filelink"+num+".value");
+                }
+                catch(err) {
+                   continue;
+                }
                 if (eval("document.forms.groupsort.check"+num+".checked") && eval("document.forms.groupsort.filelink"+num+".value") != '') {
                     opener.document.forms.simpleedit.importdetail.value+='&'+
                     eval("document.forms.groupsort.title"+num+".value")+'='+
@@ -1098,7 +1104,7 @@ JAVASCRIPT
 
 # HTML-Markup for table if in view-mode
 my $wishlistHTMLview;
-my $indent = $indentConst;
+my $indent_view = $indentConst;
 sub wishlistView {
     my $nodes = shift;
 
@@ -1117,7 +1123,7 @@ sub wishlistView {
 
         # entry is a folder
         if ($n->value()->path() eq '') {
-            $wishlistHTMLview .= '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px; min-width: 220px;">'.
+            $wishlistHTMLview .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_view-$indentConst)<0?0:($indent_view-$indentConst)).'px; min-width: 220px;">'.
                                  '<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"/>'.
@@ -1125,7 +1131,7 @@ sub wishlistView {
         }
         # entry is a link
         else {
-            $wishlistHTMLview .= '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<=0?$indentConst:$indent).'px; min-width: 220px;">'.
+            $wishlistHTMLview .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_view-$indentConst)<=0?$indentConst:$indent_view).'px; min-width: 220px;">'.
                                  '<a href="javascript:preview('."'".$n->value()->path()."'".');">'.
                                  '<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link" />'.
                                  $n->value()->title().'</a></td>';
@@ -1155,9 +1161,9 @@ sub wishlistView {
         # if the entry is a folder, it could have other entries as content. if it has, call wishlistView for those entries 
         my @children = $n->children();
         if ($#children >=0) {
-            $indent += 20;
+            $indent_view += 20;
             &wishlistView(\@children);
-            $indent -= 20;
+            $indent_view -= 20;
         }
     }
 }
@@ -1165,7 +1171,7 @@ sub wishlistView {
 
 # HTML-Markup for table if in edit-mode
 my $wishlistHTMLedit;
-my $indent = $indentConst;
+my $indent_edit = $indentConst;
 sub wishlistEdit {
     my $nodes = shift;
     my $curNode = 1;
@@ -1200,7 +1206,7 @@ sub wishlistEdit {
         if ($n->value()->path() eq '') {
             $wishlistHTMLedit .= '<td><select class="LC_hidden" name="sel" id="sel'.$index.'" onchange="submitSelect();">'.
                                  $options.'</select></td>'.
-                                 '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px;">'.
+                                 '<td id="padd'.$index.'" style="padding-left:'.(($indent_edit-$indentConst)<0?0:($indent_edit-$indentConst)).'px;">'.
                                  '<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>'.
@@ -1212,7 +1218,7 @@ sub wishlistEdit {
         else {
             $wishlistHTMLedit .= '<td><select class="LC_hidden" name="sel" id="sel'.$index.'" onchange="submitSelect();">'.
                                  $options.'</select></td>'.
-                                 '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<=0?$indentConst:$indent).'px;">'.
+                                 '<td id="padd'.$index.'" style="padding-left:'.(($indent_edit-$indentConst)<=0?$indentConst:$indent_edit).'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>';
@@ -1242,9 +1248,9 @@ sub wishlistEdit {
         # if the entry is a folder, it could have other entries as content. if it has, call wishlistEdit for those entries 
         my @children = $n->children();
         if ($#children >=0) {
-            $indent += 20;
+            $indent_edit += 20;
             &wishlistEdit(\@children);
-            $indent -= 20;
+            $indent_edit -= 20;
         }
     }
 }
@@ -1254,7 +1260,7 @@ sub wishlistEdit {
 # HTML-Markup for table if in move-mode
 my $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>';
-my $indent = $indentConst;
+my $indent_move = $indentConst;
 sub wishlistMove {
     my $nodes = shift;
     my $marked = shift;
@@ -1278,12 +1284,12 @@ sub wishlistMove {
             # display a radio-button, if the folder was not selected to be moved
             if (!$isIn) {
                 $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;">';
+                                     '<td id="padd'.$index.'" style="padding-left:'.(($indent_move-$indentConst)<0?0:($indent_move-$indentConst)).'px; min-width: 220px;">';
             }
             # 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;'.
+                                     '<td id="padd'.$index.'" style="padding-left:'.(($indent_move-$indentConst)<0?0:($indent_move-$indentConst)).'px; min-width: 220px;'.
                                      'color:red;">';
             }
             #arrow- and folder-image, all folders are open, and title
@@ -1300,7 +1306,7 @@ sub wishlistMove {
             }
             # link-image and title
             $wishlistHTMLmove .= '<td></td>'.
-                                 '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<=0?$indentConst:$indent).'px; min-width: 220px;">'.
+                                 '<td id="padd'.$index.'" style="padding-left:'.(($indent_move-$indentConst)<=0?$indentConst:$indent_move).'px; min-width: 220px;">'.
                                  '<a href="javascript:preview('."'".$n->value()->path()."'".');" '.$highlight.'>'.
                                  '<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link"/>'.
                                  $n->value()->title().'</a></td>';
@@ -1330,9 +1336,9 @@ sub wishlistMove {
         # if the entry is a folder, it could have other entries as content. if it has, call wishlistMove for those entries 
         my @children = $n->children();
         if ($#children >=0) {
-            $indent += 20;
+            $indent_move += 20;
             &wishlistMove(\@children, $marked);
-            $indent -= 20;
+            $indent_move -= 20;
         }
     }
 }
@@ -1341,7 +1347,7 @@ sub wishlistMove {
 
 # HTML-Markup for table if in import-mode
 my $wishlistHTMLimport;
-my $indent = $indentConst;
+my $indent_imp = $indentConst;
 my $form = 1;
 sub wishlistImport {
     my ($nodes,$numskipped) = @_;
@@ -1395,7 +1401,7 @@ sub wishlistImport {
 
         # entry is a folder
         if ($n->value()->path() eq '') {
-            $wishlistHTMLimport .= '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px; min-width: 220px;">'.
+            $wishlistHTMLimport .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_imp-$indentConst)<0?0:($indent_imp-$indentConst)).'px; min-width: 220px;">'.
                                    '<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"/>'.
@@ -1403,7 +1409,7 @@ sub wishlistImport {
         }
         # entry is a link
         else {
-            $wishlistHTMLimport .= '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<=0?$indentConst:$indent).'px; min-width: 220px;">';
+            $wishlistHTMLimport .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_imp-$indentConst)<=0?$indentConst:$indent_imp).'px; min-width: 220px;">';
             unless ($nopick{$n->value()->path()}) {
                 $wishlistHTMLimport .= '<a href="javascript:preview('."'".$n->value()->path()."'".');">';
             }
@@ -1436,9 +1442,9 @@ sub wishlistImport {
         # if the entry is a folder, it could have other entries as content. if it has, call wishlistImport for those entries 
         my @children = $n->children();
         if ($#children >=0) {
-            $indent += 20;
+            $indent_imp += 20;
             &wishlistImport(\@children,$numskipped);
-            $indent -= 20;
+            $indent_imp -= 20;
         }
     }
     return;
@@ -1463,7 +1469,7 @@ sub makePage {
                                                         'onload' => 'javascript:onLoadAction('."'".$mode."'".');',
                                                         'onunload' => 'javascript:window.name = '."'loncapaclient'"}});
 
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Stored Links').&Apache::loncommon::help_open_topic('Wishlist'));
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Stored Links'),'Wishlist');
 
     # get javascript-code for wishlist-interactions
     my $js = &JSforWishlist();
@@ -1786,25 +1792,28 @@ SCRIPT
 
 # Returns the HTML-Markup for the page, shown when a link was set
 sub makePageSet {
-    # start_page 
-    my $startPage = &Apache::loncommon::start_page('Stored Links',undef,
-                                                   {'only_body' => 1});
+    my $title = 'Stored Links';
+
+    # start_page
+    my $output =
+        &Apache::loncommon::start_page($title,undef,
+                                       {'only_body' => 1})
+       .'<h1>'.&mt($title).'</h1>';
     
     # confirm success and offer link to wishlist
-    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 Stored Links').'</a>'.('&nbsp;' x 3).
-                 '<a href="javascript:;" onclick="window.close();">'.&mt('Close this window').'</a>';
+    $output .=
+        &Apache::loncommon::confirmwrapper(
+            &Apache::lonhtmlcommon::confirm_success(
+                &mt('Link successfully saved!')))
+       .&Apache::lonhtmlcommon::actionbox(
+            ['<a href="javascript:;" onclick="opener.open('."'/adm/wishlist'".');window.close();">'.&mt('Go to Stored Links').'</a>',
+             '<a href="javascript:;" onclick="window.close();">'.&mt('Close this window').'</a>'
+            ]);
 
     # end_page 
-    my $endPage =  &Apache::loncommon::end_page();
+    $output .= &Apache::loncommon::end_page();
 
-    # put all page-elements together
-    my $page = $startPage.$inner.$endPage;
-
-    return $page;
+    return $output;
 }
 
 
@@ -1897,11 +1906,11 @@ sub makeErrorPage {
                 text => 'Stored Links'});
     my $startPage = &Apache::loncommon::start_page('Stored Links');
     
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Stored Links').&Apache::loncommon::help_open_topic('Wishlist'));
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Stored Links'),'Wishlist');
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
     # error-message
-    my $inner .= '<span class="LC_error">'.&mt('An error occurred! Please try again later.').'</span>';
+    my $inner .= '<p class="LC_error">'.&mt('An error occurred! Please try again later.').'</p>';
 
     # end_page 
     my $endPage =  &Apache::loncommon::end_page();