--- loncom/interface/lonindexer.pm	2020/09/03 15:49:27	1.213.4.9
+++ loncom/interface/lonindexer.pm	2016/06/19 04:27:50	1.225
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.213.4.9 2020/09/03 15:49:27 raeburn Exp $
+# $Id: lonindexer.pm,v 1.225 2016/06/19 04:27:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -565,7 +565,7 @@ END
 	    } else {
 		$r->print($reshome);
 	    }
-	    $r->print("'>".&mt('Home directory').'</a></span>');
+	    $r->print("'>".&mt('Home').'</a></span>');
 	}
 	$r->print('</form>');
 # ------------------------------------------------------ Remember where we were
@@ -709,7 +709,20 @@ sub scanDir {
         return if ($c->aborted());
 	#This is a kludge, sorry aboot this
 	my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
-	next if($strip =~ /.*\.meta$/ | $obs eq '1');
+	next if (($strip =~ /\.meta$/) || ($obs));
+        if ($dom ne 'domain') {
+            my ($udom,$uname);
+            if ($dom eq 'user') {
+                ($udom) = ($startdir =~ m{^/res/($match_domain)});
+                $uname = $strip;
+            } else {
+                ($udom,$uname) = ($startdir =~ m{^/res/($match_domain)/($match_courseid)});
+            }
+            if ($udom ne '' && $uname ne '') {
+                # Don't display "course author" directory.
+                next if (&Apache::lonnet::is_course($udom,$uname));
+            }
+        }
 	my (@fileparts) = split(/\./,$strip);
 	if ($hash{'display_attrs_9'} != 1) {
             # if not all versions to be shown
@@ -1088,13 +1101,8 @@ $r->print ('<input type="hidden" name="a
 	my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
         my $quotable_startdir = Apache::loncommon::escape_single($startdir);
         my $quotable_listname = &Apache::loncommon::escape_single($listname);
-        my $curfext = lc((split(/\./,$listname))[-1]);
-        my $modalstyle;
-        if ($curfext =~ /^js|css|txt|tab$/) {
-            $modalstyle = ",'','background-color:#ffffff'";
-        }
 
-	$r->print (" <a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes'".$modalstyle.");\">$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:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">".&mt('metadata')."</a>) ");
@@ -1356,8 +1364,8 @@ sub coursecontext {
 	$r->print(
             &mt('Already in this course:').'<br />'
            .&mt('[_1] in folder/map [_2]',
-	        &Apache::lonnet::gettitle($resource),
-	        &Apache::lonnet::gettitle($map))
+                    &Apache::lonnet::gettitle($resource),
+                    &Apache::lonnet::gettitle($map))
            .'<br />');
     }
 }