--- loncom/interface/lonindexer.pm	2009/03/17 20:07:45	1.190
+++ loncom/interface/lonindexer.pm	2009/07/17 15:42:07	1.199
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.190 2009/03/17 20:07:45 schulted Exp $
+# $Id: lonindexer.pm,v 1.199 2009/07/17 15:42:07 droeschl 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'};
@@ -420,7 +439,7 @@ ENDHEADER
 
 # ---------------------------------- get state of file attributes to be showing
 	if ($env{'form.attrs'}) {
-	    for (my $i=0; $i<=14; $i++) {
+	    for (my $i=0; $i<=16; $i++) {
 		delete $hash{'display_attrs_'.$i};
 		if ($env{'form.attr'.$i} == 1) {
 		    $attrchk[$i] = 'checked';
@@ -428,8 +447,8 @@ ENDHEADER
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=14; $i++) {
-		$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
+	    for (my $i=0; $i<=16; $i++) {
+		$attrchk[$i] = 'checked="checked"' if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
 
@@ -448,6 +467,8 @@ ENDHEADER
 					   'nt' => 'Notes',
 					   'ab' => 'Abstract',
 					   'ln' => 'Language',
+					   'gl' => 'Grade Level',
+					   'sd' => 'Standards',
 					   'sa' => 'Source Available',
 					   'sr' => 'Show resource',
 					   'li' => 'Linked/Related Resources',
@@ -459,31 +480,33 @@ ENDHEADER
 					   'hd' => 'Display Options'
 					   );
 	$r->print(<<END);
+<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>
+<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="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><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>
 <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="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>
 </tr>
 </table>
@@ -507,7 +530,6 @@ END
         $r->print($type_element
                  .'</fieldset>');
         $r->print(<<END);
-<br />
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton
@@ -527,7 +549,7 @@ END
 # -------------------------------------------------------- Resource Home Button
 	my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
 	if ($reshome) {
-	    $r->print("<span class=\"LC_fontsize_small\"><a href='");
+	    $r->print("<span class=\"LC_fontsize_large\"><a href='");
 	    if ($env{'form.catalogmode'} eq 'import') {
 		$r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();');
 	    } else {
@@ -541,15 +563,15 @@ 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('<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()" />');
 	}
 # ----------------- 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_tableOfContent")
+        $r->print(&Apache::loncommon::start_data_table("LC_tableBrowseRes")
                  .&Apache::loncommon::start_data_table_header_row());
 	$r->print("<th $colspan>".&mt('Name')."</th>\n");
 	$r->print("<th>".&mt('Title')."</th>\n") 
@@ -581,6 +603,10 @@ END
 	    if ($hash{'display_attrs_13'} == 1);
 	$r->print("<th>".&mt("Abstract")."</th>\n")
 	    if ($hash{'display_attrs_14'} == 1);
+	$r->print("<th>".&mt("Grade Level")."</th>\n")
+	    if ($hash{'display_attrs_15'} == 1);
+	$r->print("<th>".&mt("Standards")."</th>\n")
+	    if ($hash{'display_attrs_16'} == 1);
 	    
     $r->print(&Apache::loncommon::end_data_table_header_row());
     
@@ -850,7 +876,7 @@ sub display_line {
 
     my $tabtag='</td>';
     my $i=0;
-    while ($i<=14) {
+    while ($i<=16) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
 	    if ($i != 9 &&
 		$hash{'display_attrs_'.$i} == 1);
@@ -871,16 +897,16 @@ 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_icon" />'.
+	$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());
@@ -906,16 +932,16 @@ 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_icon" /></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.
 		   '\')"><img alt="" src="'.$iconpath.'server.gif"');
-	$r->print (' class="LC_icon" />'."\n");
+	$r->print (' class="LC_fileicon" />'."\n");
 	$r->print (&mt("Domain")." - $listname </a>");
 	if (&Apache::lonnet::domain($listname,'description')) {
-	    $r->print("(".&Apache::lonnet::domain($listname,'description').
+	    $r->print("<br />(".&Apache::lonnet::domain($listname,'description').
 		      ")");
 	}
 	$r->print("</form>$tabtag");
@@ -936,15 +962,15 @@ $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_icon"'); 
-	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" /></a>'.
+		   '.gif" class="LC_fileicon"'); 
+	$r->print (' alt="'.$msg.'"/></a>'.
 		   "\n");
 	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
 	$r->print ('<a href="javascript:gothere(\''.$quotable_curdir
 		   .'\')"><img alt="'.$msg.'" src="'.
-		   $iconpath.'quill.gif" class="LC_indexer_icon" />');
+		   $iconpath.'quill.gif" class="LC_fileicon" />');
 	my $domain=(split(m|/|,$startdir))[2];
 	my $plainname=&Apache::loncommon::plainname($listname,$domain);
         $r->print ($listname.'</a>');
@@ -984,17 +1010,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"}) {
@@ -1011,8 +1037,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
@@ -1021,13 +1047,15 @@ $r->print ('<input type="hidden" name="a
 	    my $anchor = $curdir;
 	    $anchor =~ s/\W//g;
 	    $r->print ('<input type="hidden" name="acts" value="" />');
-	    $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
-		       'arrow'.($nowOpen ? "open" : "closed" ).'.gif"');
-	    $r->print (' name="'.$msg.'" type="image" class="LC_icon" />'.
+	    $r->print ('<a name="'.$anchor.'"></a>');
+            $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 (' alt="'.$msg.'" /></a>'.
 		       "\n");
 	}
 # Filetype icons
-	$r->print("<img alt=\"\" src='$iconname' class='LC_icon' />\n");
+	$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.
@@ -1042,7 +1070,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");
@@ -1059,7 +1087,7 @@ $r->print ('<input type="hidden" name="a
 
 	if ($hash{'display_attrs_4'} == 1) {
 	    my $author = &Apache::lonnet::metadata($filelink,'author');
-	    $r->print('<td> '.($author eq '' ? '&nbsp;' : $author).
+	    $r->print('<td class="LC_nobreak"> '.($author eq '' ? '&nbsp;' : $author).
 		      " </td>\n");
 	}
 	if ($hash{'display_attrs_5'} == 1) {
@@ -1079,17 +1107,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");
 
 	}
@@ -1112,11 +1136,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>');
         }
         
@@ -1125,7 +1147,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 LC_nobreak">'.($output eq '' ? '&nbsp;':$output).
 		      " </td>\n");
     }
     
@@ -1147,6 +1169,18 @@ $r->print ('<input type="hidden" name="a
 		      " </td>\n");
 	}
 	
+	if ($hash{'display_attrs_15'} == 1) {
+	    my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
+	    $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_16'} == 1) {
+	    my $standards = &Apache::lonnet::metadata($filelink,'standards');
+	    $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).
+		      " </td>\n");
+	}
+	
 	$r->print(&Apache::loncommon::end_data_table_row());
 }
     
@@ -1165,15 +1199,15 @@ $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_icon" /></a>'.
+	$r->print (' alt="'.$msg.'" class="LC_fileicon" /></a>'.
 		   "\n");
 	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
         
@@ -1181,7 +1215,7 @@ $r->print ('<input type="hidden" name="a
 	my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';
         $r->print ('<a href="javascript:gothere(\''
 		   .$quotable_curdir.'\')"">'
-		   .'<img alt="'.&mt('Open Folder').'" src="'.
+		   .'<img class="LC_fileicon" alt="'.&mt('Open Folder').'" src="'.
                    $location."/".$icon.'" />'.
                    "\n");
 	$r->print ("$listname</a></form></td>\n");
@@ -1250,6 +1284,19 @@ $r->print ('<input type="hidden" name="a
 		      " </td>\n");
 	}
 	
+	if ($hash{'display_attrs_15'} == 1) {
+	    my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
+	    $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_16'} == 1) {
+	    my $standards = &Apache::lonnet::metadata($filelink,'standards');
+	    $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).
+		      " </td>\n");
+	}
+	
+	
 	$r->print(&Apache::loncommon::end_data_table_row());
     }
 
@@ -1299,7 +1346,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)/}) {
@@ -1330,7 +1376,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.'" />'.