--- loncom/interface/lonindexer.pm	2003/07/21 18:35:25	1.70
+++ loncom/interface/lonindexer.pm	2003/08/21 21:57:36	1.75
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.70 2003/07/21 18:35:25 ng Exp $
+# $Id: lonindexer.pm,v 1.75 2003/08/21 21:57:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -320,7 +320,11 @@ END
 <script type="text/javascript">
 $catalogmodefunctions
 function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
-    var options = "width=" + w + ",height=" + h + ",";
+    var xpos = (screen.width-w)/2;
+    xpos = (xpos < 0) ? '0' : xpos;
+    var ypos = (screen.height-h)/2-30;
+    ypos = (ypos < 0) ? '0' : ypos;
+    var options = "width=" + w + ",height=" + h + ",screenx="+xpos+",screeny="+ypos+",";
     options += "resizable=yes,scrollbars="+scrollbar+",status=no,";
     options += "menubar=no,toolbar="+toolbar+",location="+locationbar+",directories=no";
     var newWin = window.open(url, wdwName, options);
@@ -333,7 +337,9 @@ function gothere(val) {
 
 </head>
 ENDHEADER
-$r->print(&Apache::loncommon::bodytag('Browse Resources'));
+my ($headerdom)=($uri=~/^\/res\/(\w+)\//);
+$r->print(&Apache::loncommon::bodytag('Browse Resources',undef,undef,undef,
+				      $headerdom));
 # - Evaluate actions from previous page (both cumulatively and chronologically)
         if ($ENV{'form.catalogmode'} eq 'groupimport') {
 	    my $acts=$ENV{'form.acts'};
@@ -391,6 +397,8 @@ $r->print(&Apache::loncommon::bodytag('B
 	    }
 	}
 # ------------------------------- output state of file attributes to be showing
+#                                 All versions has to the last item
+#                                 since it does not take an extra col
 	$r->print(<<END);
 <form method="post" name="fileattr" action="$uri"
  enctype="application/x-www-form-urlencoded">
@@ -410,8 +418,7 @@ $r->print(&Apache::loncommon::bodytag('B
 </tr></table>
 <input type="hidden" name="dirPointer" value="on" />
 <input type="hidden" name="acts" value="" />
-<input type="submit" name="attrs" value="Review" />&nbsp;
-<input type="submit" name="attrs" value="Refresh" />
+<input type="submit" name="attrs" value="Update Display" />
 $closebutton
 $groupimportbutton
 </form>
@@ -544,13 +551,14 @@ sub scanDir {
 		my $fext = pop @fileparts;
 		my $ov = pop @fileparts;
 		my $fname = join ('.',@fileparts,$fext);
-		next if (grep /\Q$fname\E/,@list and $ov =~ /\d+/);
+		next if (grep /\Q$fname\E/,@list and $ov =~ /^\d+$/);
 	    }
 	}
 
 	if ($dom eq 'domain') {
-	    $compuri = join('',$strip,'/');  # dom list has /res/<domain name>
-	    $curdir = $compuri;
+	    # dom list has full path /res/<domain name>/ already
+	    $curdir='';
+	    $compuri = (split(/\&/,$line))[0];
 	} else {
 	    # user, dir & file have name only, i.e., w/o path
 	    $compuri = join('',$startdir,$strip,'/');
@@ -578,7 +586,7 @@ sub get_list {
     my @list;
     (my $luri = $uri) =~ s/\//_/g;
 
-    if ($ENV{'form.attrs'} eq 'Refresh') {
+    if ($ENV{'form.attrs'} eq 'Update Display') {
 	foreach (keys %hash) {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
 	    }
@@ -700,8 +708,8 @@ sub display_line {
 	    if ($ENV{'form.dirPointer'} eq "on");
 	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
 	$r->print("<td>");
-	&begin_form ($r,$filecom[0].'/');
-	my $anchor = $filecom[0].'/';
+	&begin_form ($r,$filecom[0]);
+	my $anchor = $filecom[0];
 	$anchor =~ s/\///g;
 	$r->print ('<a name="'.$anchor.'">');
 	$r->print ('<input type="hidden" name="acts" value="">');
@@ -710,7 +718,7 @@ sub display_line {
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
 		   "\n");
 	$r->print ('<a href="javascript:gothere(\''.$filecom[0].
-		   '/\')"><img src="'.$iconpath.'server.gif"');
+		   '\')"><img src="'.$iconpath.'server.gif"');
 	$r->print (' border="0" /></a>'."\n");
 	$r->print ("Domain - $listname ");
 	if ($Apache::lonnet::domaindescription{$listname}) {
@@ -828,7 +836,7 @@ sub display_line {
 		   " TARGET=_self>$listname</a> ");
 
 	$r->print (" (<a href=\"javascript:openWindow('".$filelink.
-		   ".meta', 'metadatafile', '400', '450', 'no', 'yes','no')\"; ".
+		   ".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".
 		   "TARGET=_self>metadata</a>) ") if ($metafile == 1);
 
 	$r->print("</td>\n");
@@ -886,9 +894,9 @@ sub display_line {
         }
 	if ($hash{'display_attrs_8'} == 1) {
 	    my (%stat) = &Apache::lonmeta::dynamicmeta($filelink) if ($metafile == 1);
-	    my $stat = ($stat{'course'} eq '' ? '' : $stat{'course'}).
-		(($stat{'course'} ne '' || $stat{'count'} ne '') ? '/' : '').
-		($stat{'count'} eq '' ? '' : $stat{'count'});
+	    my $stat = (exists($stat{'course'}) ? $stat{'course'} : '').
+		((exists($stat{'course'}) || exists($stat{'count'})) ? '/' : '').
+		(exists($stat{'count'}) ? $stat{'count'} : '');
 	    $r->print('<td align=center> '.($stat eq '' ? '&nbsp;' : $stat).
 		      ' </td>'."\n");
 	}