--- loncom/interface/lonindexer.pm	2011/10/14 16:58:32	1.210
+++ loncom/interface/lonindexer.pm	2012/07/16 15:30:45	1.216
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.210 2011/10/14 16:58:32 dseaton Exp $
+# $Id: lonindexer.pm,v 1.216 2012/07/16 15:30:45 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,6 +165,8 @@ sub handler {
 ENDSUBM
        $r->print(&Apache::loncommon::start_page(undef,$js,
 						{'only_body'   =>1,
+                                                 'add_modal' => 1,
+                                                 'add_wishlist' => 1,
 						 'add_entries' =>
 						     {'onload' => "load();"},}
 						).
@@ -390,6 +392,7 @@ function uncheckAll() {
         }
     }
 }
+
 function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
     var xpos = (screen.width-w)/2;
     xpos = (xpos < 0) ? '0' : xpos;
@@ -401,6 +404,7 @@ function openWindow(url, wdwName, w, h,
     var newWin = window.open(url, wdwName, options);
     newWin.focus();
 }
+
 function gothere(val) {
     window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;
 }
@@ -413,14 +417,14 @@ ENDHEADER
         if ($env{'form.catalogmode'}) {
             # "Popup mode"
             $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
-                                                     {'only_body' => 1,
+                                                     {'only_body' => 1, 'add_wishlist'=>1, 'add_modal' =>1, 
                                                       'domain' => $headerdom,}));
         } else {
             # Only display page header and breadcrumbs in non-popup mode
             &Apache::lonhtmlcommon::clear_breadcrumbs();
             &Apache::lonhtmlcommon::add_breadcrumb({
                 'text'  => 'Browse published resources',
-                'href'  => '/res/fhwfdev/?launch=1',
+                'href'  => '/res/'.$headerdom.'/?launch=1',
             });
             $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
                                                      {'domain' => $headerdom,})
@@ -755,6 +759,7 @@ sub scanDir {
 sub get_list {
     my ($r,$uri)=@_;
     my @list=();
+    my $listerror;
     
     (my $luri = $uri) =~ s/\//_/g;
     if ($env{'form.updatedisplay'}) {
@@ -779,15 +784,17 @@ sub get_list {
 	$hash{'dirlist_files_'.$luri} = join("\n",@list);
     } else {
 # is really a directory
-	@list = &Apache::lonnet::dirlist($uri);
+	(my $listref,$listerror) = &Apache::lonnet::dirlist($uri);
+        if (ref($listref) eq 'ARRAY') {
+            @list = @{$listref};
+        }
 	$hash{'dirlist_files_'.$luri} = join("\n",@list);
 	$hash{'dirlist_timestamp_files_'.$luri} = time;
     }
 #Checking for error messages associated with empty directories or inaccessible servers (See Bug 4984)
-    if($list[0] eq 'no_such_dir' || $list[0] eq 'no_such_host') { 
+    if (($listerror eq 'no_such_dir') || ($listerror eq 'no_such_host') || ($listerror eq 'no_host')) { 
         $r->print("<p class='LC_info'>" . &mt("Directory does not exist."). "</p>");
-    }
-    elsif($list[0] eq 'con_lost') {
+    } elsif ($listerror eq 'con_lost') {
         $r->print("<p class='LC_info'>" . &mt("Directory temporarily not accessible."). "</p>");
     }
 
@@ -1001,10 +1008,10 @@ $r->print ('<input type="hidden" name="a
         if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
 # Wishlistlink
         $r->print('</form></td><td><a href="javascript:;" '.
-                  'title="'.&mt('Set a link for this folder to wishlist').'" '.
+                  'title="'.&mt('Save a link for this folder in your personal Stored Links repository').'" '.
                   'onclick="set_wishlistlink('."'$plainname','$startdir$listname'".')">'.
                   '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
-                  'alt="'.&mt('set wishlistlink').'" style="width:22px;"/></a>'.$tabtag);
+                  'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a>'.$tabtag);
         $r->print(&Apache::loncommon::end_data_table_row());
         return OK;
     }
@@ -1086,25 +1093,21 @@ $r->print ('<input type="hidden" name="a
 	$r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\n");
 	my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
 
-	$r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
-		   "?inhibitmenu=yes','previewfile','450','500','no','yes','yes');\"".
-		   " target=\"_self\">$listname</a> ");
+	$r->print (" <a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">$listname</a> ");
 	$quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
 	&Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
-	$r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.
-		   "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ".
-		   " target=\"_self\">".&mt('metadata')."</a>) ");
+	$r->print (" (<a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">".&mt('metadata')."</a>) ");
 # Close form to open/close sequence
 	if ($filelink=~/\.(page|sequence)$/) {
 	    $r->print('</form>');
 	}
 	$r->print("</td>\n");
 # Wishlistlink
-        $r->print('<td><a href="javascript:;" title="'.&mt('Set a link for this resource to wishlist').'" '.
+        $r->print('<td><a href="javascript:;" title="'.&mt('Save a link for this resource in your personal Stored Links repository').'" '.
                   'onclick="set_wishlistlink('."'".&Apache::lonnet::gettitle($filelink).
                   "','$startdir$listname'".')">'.
                   '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
-                  'alt="'.&mt('set wishlistlink').'" style="width:22px;"/></a></td>');
+                  'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');
 	if ($hash{'display_attrs_0'} == 1) {
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
@@ -1255,10 +1258,10 @@ $r->print ('<input type="hidden" name="a
 	$r->print ("$listname</a></form>");
 # Wishlistlink
         $r->print('</td><td><a href="javascript:;" '.
-                  'title="'.&mt('Set a link for this folder to wishlist').'" '.
+                  'title="'.&mt('Save a link for this folder in Stored Links').'" '.
                   'onclick="set_wishlistlink('."'$listname','$startdir$listname'".')">'.
                   '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
-                  'alt="'.&mt('set wishlistlink').'" style="width:22px;"/></a></td>');
+                  'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');
 # Attributes
 	my $filelink = $startdir.$filecom[0].'/default';