--- loncom/interface/lonindexer.pm	2008/08/01 14:53:42	1.181
+++ loncom/interface/lonindexer.pm	2009/02/02 19:38:12	1.185
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.181 2008/08/01 14:53:42 bisitz Exp $
+# $Id: lonindexer.pm,v 1.185 2009/02/02 19:38:12 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -104,7 +104,7 @@ sub handler {
     my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');
 
-    my $fileclr='#ffffe6';
+#SB my $fileclr='#ffffe6';
     my $line;
     my (@attrchk,@openpath,$typeselect);
     my $uri=$r->uri;
@@ -177,7 +177,8 @@ ENDSUBM
 
 # --------------------- define extra fields and buttons in case of special mode
 	if ($env{'form.catalogmode'} eq 'interactive') {
-	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+#SB	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+            $extrafield='<td valign="bottom">'.
 		'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
 		' class="LC_icon" /></td>';
 	    $colspan=" colspan='2' ";
@@ -187,7 +188,8 @@ ENDSUBM
 END
         }
 	elsif ($env{'form.catalogmode'} eq 'import') {
-	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+#SB	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+            $extrafield='<td valign="bottom">'.
 		'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
 		' class="LC_icon" /></td>';
 	    $colspan=" colspan='2' ";
@@ -418,7 +420,7 @@ ENDHEADER
 
 # ---------------------------------- get state of file attributes to be showing
 	if ($env{'form.attrs'}) {
-	    for (my $i=0; $i<=11; $i++) {
+	    for (my $i=0; $i<=12; $i++) {
 		delete $hash{'display_attrs_'.$i};
 		if ($env{'form.attr'.$i} == 1) {
 		    $attrchk[$i] = 'checked';
@@ -426,7 +428,7 @@ ENDHEADER
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=11; $i++) {
+	    for (my $i=0; $i<=12; $i++) {
 		$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
@@ -442,6 +444,7 @@ ENDHEADER
 					   'st' => 'Statistics',
 					   'au' => 'Author',
 					   'kw' => 'Keywords',
+					   'sb' => 'Subject',
 					   'ln' => 'Language',
 					   'sa' => 'Source Available',
 					   'sr' => 'Show resource',
@@ -450,9 +453,12 @@ ENDHEADER
 					   'ud' => 'Update Display',
 					   'pr' => 'Problems',
 					   'gr' => 'Graphics',
-					   'at' => 'All types'
+					   'at' => 'All types',
+					   'hd' => 'Display Options'
 					   );
 	$r->print(<<END);
+<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>
@@ -473,6 +479,7 @@ ENDHEADER
 <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>&nbsp;</td>
 </tr>
 </table>
@@ -493,8 +500,9 @@ END
 					    %select_file_categories);
         $type_element = '<label>'.&mt('File Type Displayed: [_1]',
 				      $type_element).'</label>';
+        $r->print($type_element
+                 .'</fieldset>');
         $r->print(<<END);
-$type_element
 <br />
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
@@ -533,37 +541,42 @@ END
 	    $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onClick="javascript:uncheckAll()" />');
 	}
 # ----------------- output starting row to the indexed file/directory hierarchy
-        my $titleclr="#ddffff";
         #$r->print(&initdebug());
         #$r->print(&writedebug("Omit:@Omit")) if (@Omit);
         #$r->print(&writedebug("Only:@Only")) if (@Only);
-        $r->print('<table width="100%" border="0"><tr><td bgcolor="#777777">'."\n");
-	$r->print('<table width="100%" border="0"><tr bgcolor="'.$titleclr.'">'."\n");
-	$r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");
-	$r->print("<td><b>".&mt('Title')."</b></td>\n") 
+        $r->print('<br /><br />');
+        $r->print(&Apache::loncommon::start_data_table()
+                 .&Apache::loncommon::start_data_table_header_row());
+	$r->print("<th $colspan>".&mt('Name')."</th>\n");
+	$r->print("<th>".&mt('Title')."</th>\n") 
 	    if ($hash{'display_attrs_0'} == 1);
-	$r->print("<td align=right><b>".&mt("Size")." (".&mt("bytes").") ".
-		  "</b></td>\n") if ($hash{'display_attrs_1'} == 1);
-	$r->print("<td><b>".&mt("Last accessed")."</b></td>\n") 
+	$r->print('<th align="right">'.&mt("Size")." (".&mt("bytes").") ".
+		  "</th>\n") if ($hash{'display_attrs_1'} == 1);
+	$r->print("<th>".&mt("Last accessed")."</th>\n") 
 	    if ($hash{'display_attrs_2'} == 1);
-	$r->print("<td><b>".&mt("Last modified")."</b></td>\n")
+	$r->print("<th>".&mt("Last modified")."</th>\n")
 	    if ($hash{'display_attrs_3'} == 1);
-	$r->print("<td><b>".&mt("Author(s)")."</b></td>\n")
+	$r->print("<th>".&mt("Author(s)")."</th>\n")
 	    if ($hash{'display_attrs_4'} == 1);
-	$r->print("<td><b>".&mt("Keywords")."</b></td>\n")
+	$r->print("<th>".&mt("Keywords")."</th>\n")
 	    if ($hash{'display_attrs_5'} == 1);
-	$r->print("<td><b>".&mt("Language")."</b></td>\n")
+	$r->print("<th>".&mt("Language")."</th>\n")
 	    if ($hash{'display_attrs_6'} == 1);
-	$r->print("<td><b>".&mt("Usage Statistics")." <br />(".
-		  &mt("Courses/Network Hits").")</b> ".&mt('updated periodically')."</td>\n")
+	$r->print("<th>".&mt("Usage Statistics")." <br />(".
+		  &mt("Courses/Network Hits").") ".&mt('updated periodically')."</th>\n")
 	    if ($hash{'display_attrs_8'} == 1);
-	$r->print("<td><b>".&mt("Source Available")."</b></td>\n")
+	$r->print("<th>".&mt("Source Available")."</th>\n")
 	    if ($hash{'display_attrs_10'} == 1);
-	$r->print("<td><b>".&mt("Linked/Related Resources")."</b></td>\n")
+	$r->print("<th>".&mt("Linked/Related Resources")."</th>\n")
 	    if ($hash{'display_attrs_11'} == 1);
-	$r->print("<td><b>".&mt("Resource")."</b></td>\n")
+	$r->print("<th>".&mt("Resource")."</th>\n")
 	    if ($hash{'display_attrs_7'} == 1);
-	$r->print('</tr>');
+	$r->print("<th>".&mt("Subject")."</th>\n")
+	    if ($hash{'display_attrs_12'} == 1);
+	    
+    $r->print(&Apache::loncommon::end_data_table_header_row());
+    
+    	
 
 # ----------------- read in what directories have previously been set to "open"
 	foreach (keys %hash) {
@@ -613,15 +626,13 @@ END
 
 # -------- recursively go through all the directories and output as appropriate
 	&scanDir ($r,$toplevel,$indent,\%hash);
-	
 
 # -------------------------------------------------------------- end the tables
-	$r->print('</table>');
+        $r->print(&Apache::loncommon::end_data_table());
+
 # ---------------------------- embed hidden information useful for group import
 	$r->print("<form name='fnum' action=''>");
 	$r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");
-# -------------------------------------------------------------- end the tables
-	$r->print('</td></tr></table>');
 
 # --------------------------------------------------- end the output and return
 	$r->print(&Apache::loncommon::end_page()."\n");
@@ -818,7 +829,7 @@ sub display_line {
 	$pathprefix=$startdir;
     }
     my $dirptr=16384;
-    my $fileclr="#ffffe6";
+#SB my $fileclr="#ffffe6";
     my $iconpath= $r->dir_config('lonIconsURL') . '/';
 
     my @filecom = split (/\&/,$line);
@@ -830,7 +841,7 @@ sub display_line {
 
     my $tabtag='</td>';
     my $i=0;
-    while ($i<=11) {
+    while ($i<=12) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
 	    if ($i != 9 &&
 		$hash{'display_attrs_'.$i} == 1);
@@ -845,7 +856,9 @@ sub display_line {
 	$updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];
 	$updir=~s/\/+/\//g;
 
-	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
+#SB	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
+        $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?
+        $r->print($extrafield);
 	$r->print("<td>\n");
 	$r->print ('<form method="post" name="dirpathUP" action="'.$updir.
 		   '/" '.
@@ -860,7 +873,8 @@ sub display_line {
 	$r->print ('<input src="'.$iconpath.'arrow_up.gif"');
 	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
-	$r->print(&mt("Up")."</form>$tabtag</tr>\n");
+	$r->print(&mt("Up")."</form>$tabtag");
+        $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
     }
 # Do we have permission to look at this?
@@ -868,13 +882,15 @@ sub display_line {
     if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); }
 
 # make absolute links appear on different background
-    if ($absolute) { $fileclr='#ccdd99'; }
+#SB    if ($absolute) { $fileclr='#ccdd99'; }
 
 # display domain
     if ($filecom[1] eq 'domain') {
  	$r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n")
  	    if ($env{'form.dirPointer'} eq "on");
-	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
+#SB	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
+	$r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?"
+        $r->print($extrafield);
 	$r->print("<td>");
 	&begin_form ($r,$filecom[0]);
 	my $anchor = $filecom[0];
@@ -894,7 +910,8 @@ sub display_line {
 	    $r->print("(".&Apache::lonnet::domain($listname,'description').
 		      ")");
 	}
-	$r->print ("</form>$tabtag</tr>\n");
+	$r->print("</form>$tabtag");
+         $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
 
 # display user directory
@@ -904,7 +921,9 @@ sub display_line {
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\W//g;
-	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
+#SB	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
+        $r->print(&Apache::loncommon::start_data_table_row()
+                 .$extrafield.'<td valign="'.$valign.'">');
 	&begin_form ($r,$curdir);
 	$r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
 		   'whitespace1.gif" class="LC_icon" />'."\n");
@@ -921,7 +940,8 @@ sub display_line {
 	my $plainname=&Apache::loncommon::plainname($listname,$domain);
 	$r->print ($listname);
 	if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
-	$r->print ('</form>'.$tabtag.'</tr>'."\n");
+	$r->print('</form>'.$tabtag);
+        $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
     }
 
@@ -944,7 +964,9 @@ sub display_line {
         }
 	# Set the icon for the file
 	my $iconname = &Apache::loncommon::icon($listname);
-	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\"><td nowrap='nowrap' valign='top'>");
+#SB	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">);
+	$r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
+        $r->print('<td valign="top"><span class="LC_nobreak">');
 	
         if ($env{'form.catalogmode'} eq 'interactive') {
 	    my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
@@ -952,7 +974,7 @@ sub display_line {
                       $quotable_filelink,"')\">");
 	    $r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".
 		      "\n");
-	    $r->print("</td><td nowrap='nowrap' valign='top'>");
+	    $r->print('</span></td><td valign="top"><span class="LC_nobreak">');
 	} elsif ($env{'form.catalogmode'} eq 'import') {
 	    $r->print("<form name='form$fnum' action=''>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
@@ -962,7 +984,7 @@ sub display_line {
 		$r->print("checked");
 	    }
 	    $r->print(" />\n");
-	    $r->print("</form></td><td nowrap='nowrap' valign='top'>");
+	    $r->print('</form></span></td><td valign="top"><span class="LC_nobreak">');
 	    $hash{"pre_${fnum}_link"}=$filelink;
 	    $hash{"pre_${fnum}_title"}=$title;
 	    if (!$hash{"pre_${fnum}_title"}) {
@@ -977,7 +999,7 @@ sub display_line {
 	    $indent--;
 	}
 # General indentation
-	if ($indent > 0 and $indent < 11) {
+	if ($indent > 0 and $indent < 12) {
 	    $r->print("<img alt=\"\" src='",$iconpath,"whitespace",$indent,
 		      ".gif' class='LC_icon' />\n");
 	} elsif ($indent >0) {
@@ -1019,12 +1041,12 @@ sub display_line {
 	if ($filelink=~/\.(page|sequence)$/) {
 	    $r->print('</form>');
 	}
-	$r->print("</td>\n");
+	$r->print("</span></td>\n");
 	if ($hash{'display_attrs_0'} == 1) {
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
-	$r->print('<td align=right> ',
+	$r->print('<td align="right"> ',
 		  $filecom[8]," </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
 	$r->print('<td> '.
@@ -1045,7 +1067,6 @@ sub display_line {
 	    $r->print('<td> '.($keywords eq '' ? '&nbsp;' : $keywords).
 		      " </td>\n");
 	}
-#'
 
 	if ($hash{'display_attrs_6'} == 1) {
 	    my $lang = &Apache::lonnet::metadata($filelink,'language');
@@ -1097,24 +1118,40 @@ sub display_line {
            &dynmetaprint($r,$filelink,'course_list');
 	   $r->print('</td>');
         }
-        if ($hash{'display_attrs_7'} == 1) {
+        
+   
+	
+	if ($hash{'display_attrs_7'} == 1) {
 # Show resource
 	   my $output=&showpreview($filelink);
            $r->print('<td> '.($output eq '' ? '&nbsp;':$output).
 		      " </td>\n");
-        }
-	$r->print("</tr>\n");
     }
+    
+    if ($hash{'display_attrs_12'} == 1) {
+	    my $subject = &Apache::lonnet::metadata($filelink,'subject');
+	    # $keywords = '&nbsp;' if (!$keywords);
+	    $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).
+		      " </td>\n");
+	}
+	
+	$r->print(&Apache::loncommon::end_data_table_row());
+}
+    
+    
 
 # -- display directory
     if ($fnptr == $dirptr) {
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\W//g;
-	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
+#SB	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
+        $r->print(&Apache::loncommon::start_data_table_row()); # SB: bgcolor suggestion: darkgrey ("LC_info_row"?!?)
+#	$r->print('<tr class="LC_info_row">');
+        $r->print($extrafield.'<td valign="'.$valign.'">');
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
-	if ($indentm1 < 11 and $indentm1 > 0) {
+	if ($indentm1 < 12 and $indentm1 > 0) {
 	    $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indentm1,
 		      ".gif class='LC_icon' />\n");
 	} else {
@@ -1149,7 +1186,7 @@ sub display_line {
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
-	$r->print('<td align=right> ',
+	$r->print('<td align="right"> ',
 		  $filecom[8]," </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
 	$r->print('<td> '.
@@ -1176,19 +1213,27 @@ sub display_line {
 	    $r->print('<td> '.($lang eq '' ? '&nbsp;' : $lang).
 		      " </td>\n");
 	}
+	
 	if ($hash{'display_attrs_8'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
 	}
  	if ($hash{'display_attrs_10'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
 	}
-	if ($hash{'display_attrs_11'} == 1) {
-	   $r->print('<td>&nbsp;</td>');
-	}
 	if ($hash{'display_attrs_7'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
-        }
-	$r->print('</tr>');
+    }     
+    if ($hash{'display_attrs_11'} == 1) {
+	   $r->print('<td>&nbsp;</td>');
+	}
+	if ($hash{'display_attrs_12'} == 1) {
+	    my $subject = &Apache::lonnet::metadata($filelink,'subject');
+	    # $keywords = '&nbsp;' if (!$keywords);
+	    $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).
+		      " </td>\n");
+	}
+	
+	$r->print(&Apache::loncommon::end_data_table_row());
     }
 
 }