--- loncom/interface/lonindexer.pm	2009/03/19 15:01:24	1.195
+++ loncom/interface/lonindexer.pm	2010/03/29 23:25:16	1.205
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.195 2009/03/19 15:01:24 jms Exp $
+# $Id: lonindexer.pm,v 1.205 2010/03/29 23:25:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -184,7 +184,7 @@ ENDSUBM
 	    $colspan=" colspan='2' ";
             my $cl=&mt('Close');
             $closebutton=<<END;
-<input type="button" name="close" value='$cl' onClick="self.close()" />
+<input type="button" name="close" value='$cl' onclick="self.close()" />
 END
         }
 	elsif ($env{'form.catalogmode'} eq 'import') {
@@ -196,11 +196,11 @@ END
 	    my $cl=&mt('Close');
             my $gi=&mt('Import');
             $closebutton=<<END;
-<input type="button" name="close" value='$cl' onClick="self.close()" />
+<input type="button" name="close" value='$cl' onclick="self.close()" />
 END
             $groupimportbutton=<<END;
 <input type="button" name="groupimport" value='$gi'
-onClick="javascript:select_group()" />
+onclick="javascript:select_group()" />
 END
         }
 	# Additions made by Matthew to make the browser a little easier to deal
@@ -361,6 +361,7 @@ END
         
 	my $js = <<"ENDHEADER";
 <script type="text/javascript">
+// <![CDATA[
 $catalogmodefunctions;
 function update_only(field) {
     alert(field.name);
@@ -405,12 +406,30 @@ function openWindow(url, wdwName, w, h,
 function gothere(val) {
     window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;
 }
+// ]]>
 </script>
 ENDHEADER
 
         my ($headerdom)=($uri=~m{^/res/($match_domain)/});
-	$r->print(&Apache::loncommon::start_page('Content Library',$js,
-						 {'domain' => $headerdom,}));
+
+        if ($env{'form.catalogmode'}) {
+            # "Popup mode"
+            $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
+                                                     {'only_body' => 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',
+            });
+            $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
+                                                     {'domain' => $headerdom,})
+                     .&Apache::lonhtmlcommon::breadcrumbs()
+            );
+        }
+
 # ---------------------------------- get state of file types to be showing
 	if ($env{'form.only'}) {
 	    $typeselect = $env{'form.only'};
@@ -429,30 +448,32 @@ ENDHEADER
 	    }
 	} else {
 	    for (my $i=0; $i<=16; $i++) {
-		$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
+		$attrchk[$i] = 'checked="checked"' if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
 
+        my @file_categories = &Apache::loncommon::filecategories();
+        my %select_file_categories;
+        my @select_form_order = ('');
+        $select_file_categories{''} = &mt('All file types');
+        foreach my $cat (@file_categories) {
+            my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
+            $select_file_categories{$types} = &mt($cat);
+            push(@select_form_order,$types);
+        }
+        $select_file_categories{'select_form_order'} = \@select_form_order;
+        my $type_element=
+            &Apache::loncommon::select_form(
+                $typeselect,
+                'only',
+                %select_file_categories);
+        my $type_selector = '<label>'.&mt('File Type Displayed: [_1]',
+                                          $type_element).'</label>';
+
 # ------------------------------- output state of file attributes to be showing
 #                                 All versions has to the last item
 #                                 since it does not take an extra col
 	my %lt=&Apache::lonlocal::texthash(
-					   'ti' => 'Title',
-					   'si' => 'Size',
-					   'la' => 'Last access',
-					   'lm' => 'Last modified',
-					   'st' => 'Statistics',
-					   'au' => 'Author',
-					   'kw' => 'Keywords',
-					   'sb' => 'Subject',
-					   'nt' => 'Notes',
-					   'ab' => 'Abstract',
-					   'ln' => 'Language',
-					   'gl' => 'Grade Level',
-					   'sd' => 'Standards',
-					   'sa' => 'Source Available',
-					   'sr' => 'Show resource',
-					   'li' => 'Linked/Related Resources',
 					   'av' => 'All versions',
 					   'ud' => 'Update Display',
 					   'pr' => 'Problems',
@@ -460,59 +481,61 @@ ENDHEADER
 					   'at' => 'All types',
 					   'hd' => 'Display Options'
 					   );
-	$r->print(<<END);
+        my @disp_order = ('0','4','5','6','13','1','2','3','10','14','8','11','7','12','15','16');
+        my %disp_options = &Apache::lonlocal::texthash (
+                              0  => 'Title',
+                              4  => 'Author',
+                              5  => 'Keywords',
+                              6  => 'Language',
+                              13 => 'Notes',
+                              1  => 'Size',
+                              2  => 'Last access',
+                              3  => 'Last modified',
+                              10 => 'Source Available',
+                              14 => 'Abstract',
+                              8  => 'Statistics',
+                              11 => 'Linked/Related Resources',
+                              7  => 'Show resource',
+                              12 => 'Subject',
+                              15 => 'Grade Level',
+                              16 => 'Standards',
+                           );
+        my $cell = 0;
+        my $numinrow = 4;
+	$r->print('
+<form method="post" name="fileattr" action="'.$uri.'" enctype="application/x-www-form-urlencoded">
 <fieldset>
-<legend>$lt{'hd'}</legend>
-<form method="post" name="fileattr" action="$uri"
- enctype="application/x-www-form-urlencoded">
-<label><input type="checkbox" name="attr9" value="1" $attrchk[9] onClick="this.form.submit();" /> $lt{'av'}</label>
-<table border="0">
-<tr>
-<td><label><input type="checkbox" name="attr0" value="1" $attrchk[0] onClick="this.form.submit();" /> $lt{'ti'}</label></td>
-<td><label><input type="checkbox" name="attr4" value="1" $attrchk[4] onClick="this.form.submit();" /> $lt{'au'}</label></td>
-<td><label><input type="checkbox" name="attr5" value="1" $attrchk[5] onClick="this.form.submit();" /> $lt{'kw'}</label></td>
-<td><label><input type="checkbox" name="attr6" value="1" $attrchk[6] onClick="this.form.submit();" /> $lt{'ln'}</label></td>
-<td><label><input type="checkbox" name="attr13" value="1" $attrchk[13] onClick="this.form.submit();" /> $lt{'nt'}</label></td>
-<td><label><input type="checkbox" name="attr16" value="1" $attrchk[16] onClick="this.form.submit();" /> $lt{'sd'}</label></td>
-</tr>
-<tr>
-<td><label><input type="checkbox" name="attr1" value="1" $attrchk[1] onClick="this.form.submit();" /> $lt{'si'}</label></td>
-<td><label><input type="checkbox" name="attr2" value="1" $attrchk[2] onClick="this.form.submit();" /> $lt{'la'}</label></td>
-<td><label><input type="checkbox" name="attr3" value="1" $attrchk[3] onClick="this.form.submit();" /> $lt{'lm'}</label></td>
-<td><label><input type="checkbox" name="attr10" value="1" $attrchk[10] onClick="this.form.submit();" /> $lt{'sa'}</label></td>
-<td><label><input type="checkbox" name="attr14" value="1" $attrchk[14] onClick="this.form.submit();" /> $lt{'ab'}</label></td>
-<td>&nbsp;</td>
-</tr>
+<legend>'.$lt{'hd'}.'</legend>
+<table style=" border-collapse: collapse; border-style: none;">'."\n");
+        foreach my $item (@disp_order) {
+            my $style = 'padding-left: 12px; padding-right: 8px;';
+            if ($cell%$numinrow == 0) {
+                $r->print('<tr>');
+            }
+            $cell ++;
+            if ($cell > 3 * $numinrow) {
+                $style .= ' padding-bottom: 6px;'; 
+            }
+            if (defined($disp_options{$item})) {
+                $r->print('<td style="'.$style.'"><span class="LC_nobreak">'.
+                          '<label><input type="checkbox" name="attr'.$item.'" value="1" '.
+                          $attrchk[$item].' onclick="this.form.submit();" /> '.$disp_options{$item}.
+                          '</label></span></td>'."\n");
+            }
+            if ($cell > 1 && $cell%$numinrow == 0) {
+                $r->print('</tr>');
+            }
+        }
+        $r->print(<<END);
 <tr>
-<td><label><input type="checkbox" name="attr8" value="1" $attrchk[8] onClick="this.form.submit();" /> $lt{'st'}</label></td>
-<td><label><input type="checkbox" name="attr11" value="1" $attrchk[11] onClick="this.form.submit();" /> $lt{'li'}</label></td>
-<td><label><input type="checkbox" name="attr7" value="1" $attrchk[7] onClick="this.form.submit();" /> $lt{'sr'}</label></td>
-<td><label><input type="checkbox" name="attr12" value="1" $attrchk[12] onClick="this.form.submit();" /> $lt{'sb'}</label></td>
-<td><label><input type="checkbox" name="attr15" value="1" $attrchk[15] onClick="this.form.submit();" /> $lt{'gl'}</label></td>
-<td>&nbsp;</td>
+<td style="font-style: italic; border-top: 1px solid black; padding-top: 6px"> 
+<label><input type="checkbox" name="attr9" value="1" $attrchk[9] onclick="this.form.submit();" /> $lt{'av'}</label>
+</td>
+<td colspan="3" style="padding-left:8px; padding-top: 4px; font-style: italic; border-top: 1px solid black; padding-top: 8px">$type_selector</td>
 </tr>
 </table>
 <input type="hidden" name="attrs" value="1" />
-END
-        my @file_categories = &Apache::loncommon::filecategories();
-        my %select_file_categories;
-        my @select_form_order = ('');
-        $select_file_categories{''} = &mt('All file types');
-        foreach my $cat (@file_categories) {
-	    my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
-	    $select_file_categories{$types} = $cat;
-	    push(@select_form_order,$types);
-	}
-        $select_file_categories{'select_form_order'} = \@select_form_order;
-        my $type_element=
-	    &Apache::loncommon::select_form($typeselect,'only',
-					    %select_file_categories);
-        $type_element = '<label>'.&mt('File Type Displayed: [_1]',
-				      $type_element).'</label>';
-        $r->print($type_element
-                 .'</fieldset>');
-        $r->print(<<END);
-<br />
+</fieldset>
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton
@@ -524,11 +547,21 @@ END
 	$storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
 	$storeuri=~s/\/+/\//g;
 # ---------------------------------------------------------------- Bread crumbs
-        $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','',
-				(($env{'form.catalogmode'} eq 'import')?
-				 'document.forms.fileattr':'')).
-		  &Apache::lonhtmlcommon::select_recent('residx','resrecent',
-'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));
+        $r->print(
+            '<p>'
+           .&Apache::lonhtmlcommon::crumbs(
+                $storeuri,
+                '',
+                '',
+                (($env{'form.catalogmode'} eq 'import')?
+                                 'document.forms.fileattr':''))
+           .'<br />'
+           .&Apache::lonhtmlcommon::select_recent(
+                'residx',
+                'resrecent',
+                'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();')
+           .'</p>'
+        );
 # -------------------------------------------------------- Resource Home Button
 	my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
 	if ($reshome) {
@@ -546,14 +579,13 @@ END
 	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # -------------------------------------------------- Check All and Uncheck all
 	if ($env{'form.catalogmode'} eq 'import') {
-	    $r->print('<br /><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onClick="javascript:checkAll()" />');
-	    $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onClick="javascript:uncheckAll()" />');
+	    $r->print('<p><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onclick="javascript:checkAll()" />');
+	    $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onclick="javascript:uncheckAll()" /></p>');
 	}
 # ----------------- output starting row to the indexed file/directory hierarchy
         #$r->print(&initdebug());
         #$r->print(&writedebug("Omit:@Omit")) if (@Omit);
         #$r->print(&writedebug("Only:@Only")) if (@Only);
-        $r->print('<br /><br />');
         $r->print(&Apache::loncommon::start_data_table("LC_tableBrowseRes")
                  .&Apache::loncommon::start_data_table_header_row());
 	$r->print("<th $colspan>".&mt('Name')."</th>\n");
@@ -880,24 +912,23 @@ sub display_line {
 	$r->print("<td>\n");
 	$r->print ('<form method="post" name="dirpathUP" action="'.$updir.
 		   '/" '.
-		   'onSubmit="return rep_dirpath(\'UP\','.
+		   'onsubmit="return rep_dirpath(\'UP\','.
 		   'document.forms.fileattr.acts.value)" '.
 		   'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");
 	$r->print(&Apache::loncommon::inhibit_menu_check('input'));
-	$r->print ('<input type=hidden name=openuri value="'.
+	$r->print ('<input type="hidden" name="openuri" value="'.
 		   $startdir.'" />'."\n");
         $r->print ('<input type="hidden" name="acts" value="" />'."\n");
-	$r->print ('<a href="#" onClick="document.dirpathUP.submit()"><img src="'.$iconpath.'arrow.up.gif"');
-	$r->print (' name="'.$msg.'" type="image" class="LC_fileicon" />'.
+	$r->print ('<a href="#" onclick="document.dirpathUP.submit()"><img src="'.$iconpath.'arrow.up.gif"');
+	$r->print (' alt="'.$msg.'" class="LC_fileicon" />'.
 		   "\n");
 	$r->print(&mt("Up")."</a></form>$tabtag");
         $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
     }
 # Do we have permission to look at this?
-
-    if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); }
+    if($filecom[15] ne '1') { return OK if ((!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])) && (!&Apache::lonnet::allowed('bro',$pathprefix.$filecom[0]))); }
 
 # make absolute links appear on different background
 #SB    if ($absolute) { $fileclr='#ccdd99'; }
@@ -915,8 +946,8 @@ sub display_line {
 	$anchor =~ s/\W//g;
 	$r->print ('<a name="'.$anchor.'"></a>');
 $r->print ('<input type="hidden" name="acts" value="" />');
-	$r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"'); 
-	$r->print (' name="'.$msg.'" type="image" class="LC_fileicon" /></a>'.
+	$r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"'); 
+	$r->print (' alt="'.$msg.'" class="LC_fileicon" /></a>'.
 		   "\n");
 	my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
 	$r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
@@ -945,10 +976,10 @@ $r->print ('<input type="hidden" name="a
 	$r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
 		   'whitespace_21.gif" class="LC_icon" />'."\n");
 	$r->print ('<input type="hidden" name="acts" value="" />');
-	$r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()">');
+	$r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()">');
         $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
 		   '.gif" class="LC_fileicon"'); 
-	$r->print (' name="'.$msg.'"/></a>'.
+	$r->print (' alt="'.$msg.'"/></a>'.
 		   "\n");
 	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
 	$r->print ('<a href="javascript:gothere(\''.$quotable_curdir
@@ -993,17 +1024,17 @@ $r->print ('<input type="hidden" name="a
                       $quotable_filelink,"')\">");
 	    $r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".
 		      "\n");
-	    $r->print('</td><td class="LC_middle"><span class="LC_nobreak">');
+	    $r->print('</td><td class="LC_middle">');
 	} elsif ($env{'form.catalogmode'} eq 'import') {
 	    $r->print("<form name='form$fnum' action=''>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
-		      "value='$filelink' onClick='".
+		      "value='$filelink' onclick='".
 		      "javascript:queue(\"form$fnum\")' ");
 	    if ($hash{'store_'.$filelink}) {
 		$r->print("checked");
 	    }
 	    $r->print(" />\n");
-	    $r->print('</form></td><td class="LC_middle"><span class="LC_nobreak">');
+	    $r->print('</form></td><td class="LC_middle">');
 	    $hash{"pre_${fnum}_link"}=$filelink;
 	    $hash{"pre_${fnum}_title"}=$title;
 	    if (!$hash{"pre_${fnum}_title"}) {
@@ -1020,8 +1051,8 @@ $r->print ('<input type="hidden" name="a
 # General indentation
 	    my $count = 0;
 	    while ($count < $indent) {
-		$r->print("<img alt=\"\" src=".$iconpath.
-			  "whitespace_21.gif class='LC_icon' />\n");
+            $r->print('<img alt="" src="'.$iconpath.'whitespace_21.gif" 
+                class="LC_icon" />');
 	        $count++;
 	    }
 # Sequence open/close icon
@@ -1031,10 +1062,10 @@ $r->print ('<input type="hidden" name="a
 	    $anchor =~ s/\W//g;
 	    $r->print ('<input type="hidden" name="acts" value="" />');
 	    $r->print ('<a name="'.$anchor.'"></a>');
-            $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()">');
+            $r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()">');
             $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
                        '.gif" class="LC_fileicon"');
-	    $r->print (' name="'.$msg.'" type="image" class="LC_fileicon" /></a>'.
+	    $r->print (' alt="'.$msg.'" /></a>'.
 		       "\n");
 	}
 # Filetype icons
@@ -1053,7 +1084,7 @@ $r->print ('<input type="hidden" name="a
 	if ($filelink=~/\.(page|sequence)$/) {
 	    $r->print('</form>');
 	}
-	$r->print("</span></td>\n");
+	$r->print("</td>\n");
 	if ($hash{'display_attrs_0'} == 1) {
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
@@ -1090,17 +1121,13 @@ $r->print ('<input type="hidden" name="a
 # statistics
 	    &dynmetaread($filelink);
 	    $r->print("<td>");
-	    &dynmetaprint($r,$filelink,'count');
-	    &dynmetaprint($r,$filelink,'course');
-	    &dynmetaprint($r,$filelink,'stdno');
-	    &dynmetaprint($r,$filelink,'avetries');
-	    &dynmetaprint($r,$filelink,'difficulty');
-	    &dynmetaprint($r,$filelink,'disc');
-	    &dynmetaprint($r,$filelink,'clear');
-	    &dynmetaprint($r,$filelink,'technical');
-	    &dynmetaprint($r,$filelink,'correct');
-	    &dynmetaprint($r,$filelink,'helpful');
-	    &dynmetaprint($r,$filelink,'depth');
+
+        for (qw(count course stdno avetries difficulty disc clear technical
+            correct helpful depth)) {
+
+            dynmetaprint($r,$filelink,$_);
+        }
+
 	    $r->print("&nbsp;</td>\n");
 
 	}
@@ -1123,11 +1150,9 @@ $r->print ('<input type="hidden" name="a
 	   &dynmetaread($filelink);
 	   $r->print('<td>');
 	   &coursecontext($r,$filelink);
-	   &dynmetaprint($r,$filelink,'goto_list');
-	   &dynmetaprint($r,$filelink,'comefrom_list');
-	   &dynmetaprint($r,$filelink,'sequsage_list');
-	   &dynmetaprint($r,$filelink,'dependencies');
-           &dynmetaprint($r,$filelink,'course_list');
+       for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) {
+             dynmetaprint($r,$filelink,$_);
+       }
 	   $r->print('</td>');
         }
         
@@ -1136,7 +1161,7 @@ $r->print ('<input type="hidden" name="a
 	if ($hash{'display_attrs_7'} == 1) {
 # Show resource
 	   my $output=&showpreview($filelink);
-           $r->print('<td> '.($output eq '' ? '&nbsp;':$output).
+           $r->print('<td class="LC_fontsize_medium">'.($output eq '' ? '&nbsp;':$output).
 		      " </td>\n");
     }
     
@@ -1188,25 +1213,25 @@ $r->print ('<input type="hidden" name="a
 	my $indentm1 = $indent-1;
 	my $count = 0;
 	while ($count < $indentm1) {
-	    $r->print ("<img alt=\"\" src=",$iconpath
-	               ,"whitespace_21.gif class='LC_icon' />\n");
+	    $r->print ('<img alt="" src="',$iconpath
+	               ,'whitespace_21.gif" class="LC_icon" />');
             $count++;
 	}
 	$r->print ('<input type="hidden" name="acts" value="" />');
 	$r->print ('<a name="'.$anchor.'"></a>');
-        $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.
+        $r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.
 		   'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"');
-	$r->print (' name="'.$msg.'" class="LC_fileicon" /></a>'.
+	$r->print (' alt="'.$msg.'" class="LC_fileicon" /></a>'.
 		   "\n");
 	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
         
         my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");
 	my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';
-        $r->print ('<a href="javascript:gothere(\''
-		   .$quotable_curdir.'\')"">'
-		   .'<img class="LC_fileicon" alt="'.&mt('Open Folder').'" src="'.
-                   $location."/".$icon.'" />'.
-                   "\n");
+        $r->print ('<a href="javascript:gothere('
+                  ."'$quotable_curdir'".');">'
+                  .'<img class="LC_fileicon" alt="'.&mt('Open Folder').'" src="'
+                  .$location.'/'.$icon.'" />'
+                  ."\n");
 	$r->print ("$listname</a></form></td>\n");
 # Attributes
 	my $filelink = $startdir.$filecom[0].'/default';
@@ -1335,7 +1360,6 @@ sub showpreview {
              close(FH);
           }
        }
-       $output='<span class="LC_fontsize_medium">'.$output.'</span>';
     } elsif ($embstyle eq 'img') {
        $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
     } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
@@ -1366,7 +1390,7 @@ sub begin_form {
     $uri=&Apache::loncommon::escape_single($uri);
     $r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.
 	       '#'.$anchor.
-	       '" onSubmit="return rep_dirpath(\''.$dnum.'\''.
+	       '" onsubmit="return rep_dirpath(\''.$dnum.'\''.
 	       ',document.forms.fileattr.acts.value)" '.
 	       'enctype="application/x-www-form-urlencoded">'."\n");
     $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.