--- loncom/interface/lonindexer.pm	2009/03/17 20:07:45	1.190
+++ loncom/interface/lonindexer.pm	2009/03/19 15:01:24	1.195
@@ -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.195 2009/03/19 15:01:24 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -420,7 +420,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,7 +428,7 @@ ENDHEADER
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=14; $i++) {
+	    for (my $i=0; $i<=16; $i++) {
 		$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
@@ -448,6 +448,8 @@ ENDHEADER
 					   'nt' => 'Notes',
 					   'ab' => 'Abstract',
 					   'ln' => 'Language',
+					   'gl' => 'Grade Level',
+					   'sd' => 'Standards',
 					   'sa' => 'Source Available',
 					   'sr' => 'Show resource',
 					   'li' => 'Linked/Related Resources',
@@ -471,6 +473,7 @@ ENDHEADER
 <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>
@@ -478,12 +481,14 @@ ENDHEADER
 <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="attr15" value="1" $attrchk[15] onClick="this.form.submit();" /> $lt{'gl'}</label></td>
 <td>&nbsp;</td>
 </tr>
 </table>
@@ -527,7 +532,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 {
@@ -549,7 +554,7 @@ END
         #$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 +586,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 +859,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);
@@ -880,7 +889,7 @@ sub display_line {
 		   $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 (' name="'.$msg.'" type="image" class="LC_fileicon" />'.
 		   "\n");
 	$r->print(&mt("Up")."</a></form>$tabtag");
         $r->print(&Apache::loncommon::end_data_table_row());
@@ -907,15 +916,15 @@ sub display_line {
 	$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 (' name="'.$msg.'" type="image" 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");
@@ -938,13 +947,13 @@ $r->print ('<input type="hidden" name="a
 	$r->print ('<input type="hidden" name="acts" value="" />');
 	$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 (' name="'.$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>');
@@ -1021,13 +1030,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 (' name="'.$msg.'" type="image" class="LC_fileicon" /></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.
@@ -1059,7 +1070,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) {
@@ -1147,6 +1158,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());
 }
     
@@ -1173,7 +1196,7 @@ $r->print ('<input type="hidden" name="a
 	$r->print ('<a name="'.$anchor.'"></a>');
         $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 (' name="'.$msg.'" class="LC_fileicon" /></a>'.
 		   "\n");
 	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
         
@@ -1181,7 +1204,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 +1273,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());
     }