Diff for /loncom/interface/lonindexer.pm between versions 1.192 and 1.193

version 1.192, 2009/03/17 23:11:20 version 1.193, 2009/03/18 13:47:14
Line 178  ENDSUBM Line 178  ENDSUBM
 # --------------------- define extra fields and buttons in case of special mode  # --------------------- define extra fields and buttons in case of special mode
  if ($env{'form.catalogmode'} eq 'interactive') {   if ($env{'form.catalogmode'} eq 'interactive') {
 #SB    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.  #SB    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
             $extrafield='<td class="LC_bottom">'.              $extrafield='<td valign="bottom">'.
  '<img alt="" src="'.$iconpath.'whitespace1.gif"'.   '<img alt="" src="'.$iconpath.'whitespace1.gif"'.
  ' class="LC_icon" /></td>';   ' class="LC_icon" /></td>';
     $colspan=" colspan='2' ";      $colspan=" colspan='2' ";
Line 189  END Line 189  END
         }          }
  elsif ($env{'form.catalogmode'} eq 'import') {   elsif ($env{'form.catalogmode'} eq 'import') {
 #SB    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.  #SB    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
             $extrafield='<td class="LC_bottom">'.              $extrafield='<td valign="bottom">'.
  '<img alt="" src="'.$iconpath.'whitespace1.gif"'.   '<img alt="" src="'.$iconpath.'whitespace1.gif"'.
  ' class="LC_icon" /></td>';   ' class="LC_icon" /></td>';
     $colspan=" colspan='2' ";      $colspan=" colspan='2' ";
Line 409  function gothere(val) { Line 409  function gothere(val) {
 ENDHEADER  ENDHEADER
   
         my ($headerdom)=($uri=~m{^/res/($match_domain)/});          my ($headerdom)=($uri=~m{^/res/($match_domain)/});
  $r->print(&Apache::loncommon::start_page('Content Library',$js,   $r->print(&Apache::loncommon::start_page('Browse Resources',$js,
  {'domain' => $headerdom,}));   {'domain' => $headerdom,}));
 # ---------------------------------- get state of file types to be showing  # ---------------------------------- get state of file types to be showing
  if ($env{'form.only'}) {   if ($env{'form.only'}) {
Line 420  ENDHEADER Line 420  ENDHEADER
   
 # ---------------------------------- get state of file attributes to be showing  # ---------------------------------- get state of file attributes to be showing
  if ($env{'form.attrs'}) {   if ($env{'form.attrs'}) {
     for (my $i=0; $i<=14; $i++) {      for (my $i=0; $i<=16; $i++) {
  delete $hash{'display_attrs_'.$i};   delete $hash{'display_attrs_'.$i};
  if ($env{'form.attr'.$i} == 1) {   if ($env{'form.attr'.$i} == 1) {
     $attrchk[$i] = 'checked';      $attrchk[$i] = 'checked';
Line 428  ENDHEADER Line 428  ENDHEADER
  }   }
     }      }
  } else {   } else {
     for (my $i=0; $i<=14; $i++) {      for (my $i=0; $i<=16; $i++) {
  $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;   $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
     }      }
  }   }
Line 446  ENDHEADER Line 446  ENDHEADER
    'kw' => 'Keywords',     'kw' => 'Keywords',
    'sb' => 'Subject',     'sb' => 'Subject',
    'nt' => 'Notes',     'nt' => 'Notes',
      'gl' => 'Grade Level',
    'ab' => 'Abstract',     'ab' => 'Abstract',
      'sd' => 'Standards',
    'ln' => 'Language',     'ln' => 'Language',
    'sa' => 'Source Available',     'sa' => 'Source Available',
    'sr' => 'Show resource',     'sr' => 'Show resource',
Line 471  ENDHEADER Line 473  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="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="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="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>
 <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="attr1" value="1" $attrchk[1] onClick="this.form.submit();" /> $lt{'si'}</label></td>
Line 478  ENDHEADER Line 481  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="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="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="attr14" value="1" $attrchk[14] onClick="this.form.submit();" /> $lt{'ab'}</label></td>
   <td>&nbsp;</td>
 </tr>  </tr>
 <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="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="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="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="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>&nbsp;</td>
 </tr>  </tr>
 </table>  </table>
Line 527  END Line 532  END
 # -------------------------------------------------------- Resource Home Button  # -------------------------------------------------------- Resource Home Button
  my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};   my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
  if ($reshome) {   if ($reshome) {
     $r->print("<span class=\"LC_fontsize_large\"><a href='");      $r->print("<font size='+2'><a href='");
     if ($env{'form.catalogmode'} eq 'import') {      if ($env{'form.catalogmode'} eq 'import') {
  $r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();');   $r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();');
     } else {      } else {
  $r->print($reshome);   $r->print($reshome);
     }      }
     $r->print("'>".&mt('Home').'</a></span>');      $r->print("'>".&mt('Home').'</a></font>');
  }   }
  $r->print('</form>');   $r->print('</form>');
 # ------------------------------------------------------ Remember where we were  # ------------------------------------------------------ Remember where we were
Line 549  END Line 554  END
         #$r->print(&writedebug("Omit:@Omit")) if (@Omit);          #$r->print(&writedebug("Omit:@Omit")) if (@Omit);
         #$r->print(&writedebug("Only:@Only")) if (@Only);          #$r->print(&writedebug("Only:@Only")) if (@Only);
         $r->print('<br /><br />');          $r->print('<br /><br />');
         $r->print(&Apache::loncommon::start_data_table("LC_tableBrowseRes")          $r->print(&Apache::loncommon::start_data_table()
                  .&Apache::loncommon::start_data_table_header_row());                   .&Apache::loncommon::start_data_table_header_row());
  $r->print("<th $colspan>".&mt('Name')."</th>\n");   $r->print("<th $colspan>".&mt('Name')."</th>\n");
  $r->print("<th>".&mt('Title')."</th>\n")    $r->print("<th>".&mt('Title')."</th>\n") 
     if ($hash{'display_attrs_0'} == 1);      if ($hash{'display_attrs_0'} == 1);
  $r->print('<th class="LC_right">'.&mt("Size")." (".&mt("bytes").") ".   $r->print('<th align="right">'.&mt("Size")." (".&mt("bytes").") ".
   "</th>\n") if ($hash{'display_attrs_1'} == 1);    "</th>\n") if ($hash{'display_attrs_1'} == 1);
  $r->print("<th>".&mt("Last accessed")."</th>\n")    $r->print("<th>".&mt("Last accessed")."</th>\n") 
     if ($hash{'display_attrs_2'} == 1);      if ($hash{'display_attrs_2'} == 1);
Line 581  END Line 586  END
     if ($hash{'display_attrs_13'} == 1);      if ($hash{'display_attrs_13'} == 1);
  $r->print("<th>".&mt("Abstract")."</th>\n")   $r->print("<th>".&mt("Abstract")."</th>\n")
     if ($hash{'display_attrs_14'} == 1);      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());      $r->print(&Apache::loncommon::end_data_table_header_row());
           
Line 846  sub display_line { Line 855  sub display_line {
     my $fnptr = $filecom[3]&$dirptr;      my $fnptr = $filecom[3]&$dirptr;
     my $msg = &mt('View').' '.$filecom[0].' '.&mt('resources');      my $msg = &mt('View').' '.$filecom[0].' '.&mt('resources');
     $msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened';      $msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened';
     my $nowOpen = ($diropen eq 'opened' ? 1 : 0);  
   
     my $tabtag='</td>';      my $tabtag='</td>';
     my $i=0;      my $i=0;
     while ($i<=14) {      while ($i<=16) {
  $tabtag=join('',$tabtag,"<td>&nbsp;</td>")   $tabtag=join('',$tabtag,"<td>&nbsp;</td>")
     if ($i != 9 &&      if ($i != 9 &&
  $hash{'display_attrs_'.$i} == 1);   $hash{'display_attrs_'.$i} == 1);
  $i++;   $i++;
     }      }
     my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');      my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
   
Line 878  sub display_line { Line 886  sub display_line {
  $r->print(&Apache::loncommon::inhibit_menu_check('input'));   $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");     $startdir.'" />'."\n");
         $r->print ('<input type="hidden" name="acts" value="" />'."\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 ('<input src="'.$iconpath.'arrow_up.gif"');
  $r->print (' name="'.$msg.'" type="image" class="LC_fileicon" />'.   $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
    "\n");     "\n");
  $r->print(&mt("Up")."</a></form>$tabtag");   $r->print(&mt("Up")."</form>$tabtag");
         $r->print(&Apache::loncommon::end_data_table_row());          $r->print(&Apache::loncommon::end_data_table_row());
  return OK;   return OK;
     }      }
Line 905  sub display_line { Line 913  sub display_line {
  my $anchor = $filecom[0];   my $anchor = $filecom[0];
  $anchor =~ s/\W//g;   $anchor =~ s/\W//g;
  $r->print ('<a name="'.$anchor.'"></a>');   $r->print ('<a name="'.$anchor.'"></a>');
 $r->print ('<input type="hidden" name="acts" value="" />');   $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 ('<input src="'.$iconpath.'folder_pointer_'.
  $r->print (' name="'.$msg.'" type="image" class="LC_fileicon" /></a>'.     $diropen.'.gif"'); 
    $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
    "\n");     "\n");
  my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);   my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
  $r->print ('<a href="javascript:gothere(\''.$quotable_filecom.   $r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
    '\')"><img alt="" src="'.$iconpath.'server.gif"');     '\')"><img alt="" src="'.$iconpath.'server.gif"');
  $r->print (' class="LC_fileicon" />'."\n");   $r->print (' class="LC_icon" /></a>'."\n");
  $r->print (&mt("Domain")." - $listname </a>");   $r->print (&mt("Domain")." - $listname ");
  if (&Apache::lonnet::domain($listname,'description')) {   if (&Apache::lonnet::domain($listname,'description')) {
     $r->print("<br />(".&Apache::lonnet::domain($listname,'description').      $r->print("(".&Apache::lonnet::domain($listname,'description').
       ")");        ")");
  }   }
  $r->print("</form>$tabtag");   $r->print("</form>$tabtag");
Line 931  $r->print ('<input type="hidden" name="a Line 940  $r->print ('<input type="hidden" name="a
  $anchor =~ s/\W//g;   $anchor =~ s/\W//g;
 #SB $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()          $r->print(&Apache::loncommon::start_data_table_row()
                  .$extrafield.'<td class="LC_'.$valign.'">');                   .$extrafield.'<td valign="'.$valign.'">');
  &begin_form ($r,$curdir);   &begin_form ($r,$curdir);
  $r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.   $r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
    'whitespace_21.gif" class="LC_icon" />'."\n");     'whitespace1.gif" class="LC_icon" />'."\n");
  $r->print ('<input type="hidden" name="acts" value="" />');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()">');   $r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.
         $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).     '.gif"'); 
    '.gif" class="LC_fileicon"');    $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
  $r->print (' name="'.$msg.'"/></a>'.  
    "\n");     "\n");
  my $quotable_curdir = &Apache::loncommon::escape_single($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
  $r->print ('<a href="javascript:gothere(\''.$quotable_curdir   $r->print ('<a href="javascript:gothere(\''.$quotable_curdir
    .'\')"><img alt="'.$msg.'" src="'.     .'\')"><img alt="'.$msg.'" src="'.
    $iconpath.'quill.gif" class="LC_fileicon" />');     $iconpath.'quill.gif" class="LC_indexer_icon" /></a>');
  my $domain=(split(m|/|,$startdir))[2];   my $domain=(split(m|/|,$startdir))[2];
  my $plainname=&Apache::loncommon::plainname($listname,$domain);   my $plainname=&Apache::loncommon::plainname($listname,$domain);
         $r->print ($listname.'</a>');   $r->print ($listname);
    if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
         if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }   $r->print('</form>'.$tabtag);
         $r->print('</form>'.$tabtag);  
         $r->print(&Apache::loncommon::end_data_table_row());          $r->print(&Apache::loncommon::end_data_table_row());
         return OK;   return OK;
     }      }
   
 # display file  # display file
         if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {      if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
             my $title;          my $title;
             my $filelink = $pathprefix.$filecom[0];   my $filelink = $pathprefix.$filecom[0];
             if ($hash{'display_attrs_0'} == 1) {   if ($hash{'display_attrs_0'} == 1) {
                 $title = &Apache::lonnet::gettitle($filelink);      $title = &Apache::lonnet::gettitle($filelink);
             }   }
             my @file_ext = split (/\./,$listname);   my @file_ext = split (/\./,$listname);
             my $curfext = $file_ext[-1];   my $curfext = $file_ext[-1];
             if (@Omit) {          if (@Omit) {
                 foreach (@Omit) { return OK if (lc($curfext) eq $_); }              foreach (@Omit) { return OK if (lc($curfext) eq $_); }
             }          }
             if (@Only) {          if (@Only) {
                 my $skip = 1;              my $skip = 1;
                 foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); }              foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); }
                 return OK if ($skip > 0);              return OK if ($skip > 0);
             }          }
             # Set the icon for the file   # Set the icon for the file
             my $iconname = &Apache::loncommon::icon($listname);   my $iconname = &Apache::loncommon::icon($listname);
 #SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">);  #SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">);
         $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?   $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
         $r->print('<td class="LC_middle LC_nobreak">');          $r->print('<td valign="top"><span class="LC_nobreak">');
   
         if ($env{'form.catalogmode'} eq 'interactive') {          if ($env{'form.catalogmode'} eq 'interactive') {
     my $quotable_filelink = &Apache::loncommon::escape_single($filelink);      my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
Line 984  $r->print ('<input type="hidden" name="a Line 991  $r->print ('<input type="hidden" name="a
                       $quotable_filelink,"')\">");                        $quotable_filelink,"')\">");
     $r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".      $r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".
       "\n");        "\n");
     $r->print('</td><td class="LC_middle"><span class="LC_nobreak">');      $r->print('</span></td><td valign="top"><span class="LC_nobreak">');
  } elsif ($env{'form.catalogmode'} eq 'import') {   } elsif ($env{'form.catalogmode'} eq 'import') {
     $r->print("<form name='form$fnum' action=''>\n");      $r->print("<form name='form$fnum' action=''>\n");
     $r->print("<input type='checkbox' name='filelink"."' ".      $r->print("<input type='checkbox' name='filelink"."' ".
Line 994  $r->print ('<input type="hidden" name="a Line 1001  $r->print ('<input type="hidden" name="a
  $r->print("checked");   $r->print("checked");
     }      }
     $r->print(" />\n");      $r->print(" />\n");
     $r->print('</form></td><td class="LC_middle"><span class="LC_nobreak">');      $r->print('</form></span></td><td valign="top"><span class="LC_nobreak">');
     $hash{"pre_${fnum}_link"}=$filelink;      $hash{"pre_${fnum}_link"}=$filelink;
     $hash{"pre_${fnum}_title"}=$title;      $hash{"pre_${fnum}_title"}=$title;
     if (!$hash{"pre_${fnum}_title"}) {      if (!$hash{"pre_${fnum}_title"}) {
Line 1009  $r->print ('<input type="hidden" name="a Line 1016  $r->print ('<input type="hidden" name="a
     $indent--;      $indent--;
  }   }
 # General indentation  # General indentation
    if ($indent > 0 and $indent < 16) {
       $r->print("<img alt=\"\" src='",$iconpath,"whitespace",$indent,
         ".gif' class='LC_icon' />\n");
    } elsif ($indent >0) {
       my $ten = int($indent/10.);
       my $rem = $indent%10.0;
     my $count = 0;      my $count = 0;
     while ($count < $indent) {      while ($count < $ten) {
  $r->print("<img alt=\"\" src=".$iconpath.   $r->print("<img alt=\"\" src=".$iconpath.
   "whitespace_21.gif class='LC_icon' />\n");    "whitespace10.gif class='LC_icon' />\n");
         $count++;      $count++;
     }      }
       $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
         ".gif class='LC_icon' />\n") if $rem > 0;
    }
 # Sequence open/close icon  # Sequence open/close icon
  if ($filelink=~/\.(page|sequence)$/) {   if ($filelink=~/\.(page|sequence)$/) {
     my $curdir = $startdir.$filecom[0].'/';      my $curdir = $startdir.$filecom[0].'/';
     my $anchor = $curdir;      my $anchor = $curdir;
     $anchor =~ s/\W//g;      $anchor =~ s/\W//g;
     $r->print ('<input type="hidden" name="acts" value="" />');      $r->print ('<input type="hidden" name="acts" value="" />');
     $r->print ('<a name="'.$anchor.'"></a>');      $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
             $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()">');         'folder_pointer_'.$diropen.'.gif"');
             $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).      $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
                        '.gif" class="LC_fileicon"');  
     $r->print (' name="'.$msg.'" type="image" class="LC_fileicon" /></a>'.  
        "\n");         "\n");
  }   }
 # Filetype icons  # Filetype icons
  $r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\n");   $r->print("<img alt=\"\" src='$iconname' class='LC_icon' />\n");
  my $quotable_filelink = &Apache::loncommon::escape_single($filelink);   my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
   
  $r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.   $r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
Line 1049  $r->print ('<input type="hidden" name="a Line 1063  $r->print ('<input type="hidden" name="a
     $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).      $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
       ' </td>'."\n");        ' </td>'."\n");
  }   }
  $r->print('<td class="LC_right"> ',   $r->print('<td align="right"> ',
   $filecom[8]," </td>\n")     $filecom[8]," </td>\n") 
     if $hash{'display_attrs_1'} == 1;      if $hash{'display_attrs_1'} == 1;
  $r->print('<td class="LC_nobreak"> '.   $r->print('<td> '.
                   (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")                    (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
     if $hash{'display_attrs_2'} == 1;      if $hash{'display_attrs_2'} == 1;
  $r->print('<td class="LC_nobreak"> '.   $r->print('<td> '.
                   (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")                    (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
     if $hash{'display_attrs_3'} == 1;      if $hash{'display_attrs_3'} == 1;
   
  if ($hash{'display_attrs_4'} == 1) {   if ($hash{'display_attrs_4'} == 1) {
     my $author = &Apache::lonnet::metadata($filelink,'author');      my $author = &Apache::lonnet::metadata($filelink,'author');
     $r->print('<td class="LC_nobreak"> '.($author eq '' ? '&nbsp;' : $author).      $r->print('<td> '.($author eq '' ? '&nbsp;' : $author).
       " </td>\n");        " </td>\n");
  }   }
  if ($hash{'display_attrs_5'} == 1) {   if ($hash{'display_attrs_5'} == 1) {
Line 1149  $r->print ('<input type="hidden" name="a Line 1163  $r->print ('<input type="hidden" name="a
       " </td>\n");        " </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());   $r->print(&Apache::loncommon::end_data_table_row());
 }  }
           
Line 1162  $r->print ('<input type="hidden" name="a Line 1188  $r->print ('<input type="hidden" name="a
 #SB $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(&Apache::loncommon::start_data_table_row()); # SB: bgcolor suggestion: darkgrey ("LC_info_row"?!?)
 # $r->print('<tr class="LC_info_row">');  # $r->print('<tr class="LC_info_row">');
         $r->print($extrafield.'<td class="LC_middle LC_nobreak">');          $r->print($extrafield.'<td valign="'.$valign.'">');
  &begin_form ($r,$curdir);   &begin_form ($r,$curdir);
  my $indentm1 = $indent-1;   my $indentm1 = $indent-1;
  my $count = 0;   if ($indentm1 < 12 and $indentm1 > 0) {
  while ($count < $indentm1) {      $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indentm1,
     $r->print ("<img alt=\"\" src=",$iconpath        ".gif class='LC_icon' />\n");
                ,"whitespace_21.gif class='LC_icon' />\n");   } else {
             $count++;      my $ten = int($indentm1/10.);
       my $rem = $indentm1%10.0;
       my $count = 0;
       while ($count < $ten) {
    $r->print ("<img alt=\"\" src=",$iconpath
      ,"whitespace10.gif class='LC_icon' />\n");
    $count++;
       }
       $r->print ("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
          ".gif class='LC_icon' />\n") if $rem > 0;
  }   }
  $r->print ('<input type="hidden" name="acts" value="" />');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<a name="'.$anchor.'"></a>');   $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
         $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.     'folder_pointer_'.$diropen.'.gif"');
    'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"');   $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
  $r->print (' name="'.$msg.'" class="LC_fileicon" /></a>'.  
    "\n");     "\n");
  my $quotable_curdir = &Apache::loncommon::escape_single($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
            $r->print ('<a href="javascript:gothere(\''
         my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");     .$quotable_curdir.'\')">'
  my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';     .'<img alt="'.&mt('Open Folder').'"src="'.
         $r->print ('<a href="javascript:gothere(\''     $iconpath.'folder_'.$diropen.'.gif" class="LC_icon" /></a>'.
    .$quotable_curdir.'\')"">'     "\n");
    .'<img class="LC_fileicon" alt="'.&mt('Open Folder').'" src="'.   $r->print ("$listname</form></td>\n");
                    $location."/".$icon.'" />'.  
                    "\n");  
  $r->print ("$listname</a></form></td>\n");  
 # Attributes  # Attributes
  my $filelink = $startdir.$filecom[0].'/default';   my $filelink = $startdir.$filecom[0].'/default';
   
Line 1195  $r->print ('<input type="hidden" name="a Line 1226  $r->print ('<input type="hidden" name="a
     $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).      $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
       ' </td>'."\n");        ' </td>'."\n");
  }   }
  $r->print('<td class="LC_right"> ',   $r->print('<td align="right"> ',
   $filecom[8]," </td>\n")     $filecom[8]," </td>\n") 
     if $hash{'display_attrs_1'} == 1;      if $hash{'display_attrs_1'} == 1;
  $r->print('<td class="LC_break"> '.   $r->print('<td> '.
                   (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")                    (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
     if $hash{'display_attrs_2'} == 1;      if $hash{'display_attrs_2'} == 1;
  $r->print('<td class="LC_break"> '.   $r->print('<td> '.
                   (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")                    (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
     if $hash{'display_attrs_3'} == 1;      if $hash{'display_attrs_3'} == 1;
   
Line 1252  $r->print ('<input type="hidden" name="a Line 1283  $r->print ('<input type="hidden" name="a
       " </td>\n");        " </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());   $r->print(&Apache::loncommon::end_data_table_row());
     }      }
   
Line 1301  sub showpreview { Line 1344  sub showpreview {
              close(FH);               close(FH);
           }            }
        }         }
        $output='<span class="LC_fontsize_medium">'.$output.'</span>';         $output='<font size="-2">'.$output.'</font>';
     } elsif ($embstyle eq 'img') {      } elsif ($embstyle eq 'img') {
        $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';         $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
     } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {      } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {

Removed from v.1.192  
changed lines
  Added in v.1.193


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>