Diff for /loncom/interface/lonindexer.pm between versions 1.181.4.2 and 1.181.4.5

version 1.181.4.2, 2009/08/13 12:46:29 version 1.181.4.5, 2010/03/31 00:41:44
Line 183  ENDSUBM Line 183  ENDSUBM
     $colspan=" colspan='2' ";      $colspan=" colspan='2' ";
             my $cl=&mt('Close');              my $cl=&mt('Close');
             $closebutton=<<END;              $closebutton=<<END;
 <input type="button" name="close" value='$cl' onClick="self.close()" />  <input type="button" name="close" value='$cl' onclick="self.close()" />
 END  END
         }          }
  elsif ($env{'form.catalogmode'} eq 'import') {   elsif ($env{'form.catalogmode'} eq 'import') {
Line 194  END Line 194  END
     my $cl=&mt('Close');      my $cl=&mt('Close');
             my $gi=&mt('Import');              my $gi=&mt('Import');
             $closebutton=<<END;              $closebutton=<<END;
 <input type="button" name="close" value='$cl' onClick="self.close()" />  <input type="button" name="close" value='$cl' onclick="self.close()" />
 END  END
             $groupimportbutton=<<END;              $groupimportbutton=<<END;
 <input type="button" name="groupimport" value='$gi'  <input type="button" name="groupimport" value='$gi'
 onClick="javascript:select_group()" />  onclick="javascript:select_group()" />
 END  END
         }          }
  # Additions made by Matthew to make the browser a little easier to deal   # Additions made by Matthew to make the browser a little easier to deal
Line 427  ENDHEADER Line 427  ENDHEADER
     for (my $i=0; $i<=16; $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="checked"';
     $hash{'display_attrs_'.$i} = 1;      $hash{'display_attrs_'.$i} = 1;
  }   }
     }      }
  } else {   } else {
     for (my $i=0; $i<=16; $i++) {      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;
     }      }
  }   }
   
 # ------------------------------- 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',  
    'gr' => 'Graphics',  
    '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>  
 <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>  
 <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>  
 <input type="hidden" name="attrs" value="1" />  
 END  
         my @file_categories = &Apache::loncommon::filecategories();          my @file_categories = &Apache::loncommon::filecategories();
         my %select_file_categories;          my %select_file_categories;
         my @select_form_order = ('');          my @select_form_order = ('');
         $select_file_categories{''} = &mt('All file types');          $select_file_categories{''} = &mt('All file types');
         foreach my $cat (@file_categories) {          foreach my $cat (@file_categories) {
     my $types = join(",",&Apache::loncommon::filecategorytypes($cat));              my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
     $select_file_categories{$types} = $cat;              $select_file_categories{$types} = &mt($cat);
     push(@select_form_order,$types);              push(@select_form_order,$types);
  }          }
         $select_file_categories{'select_form_order'} = \@select_form_order;          $select_file_categories{'select_form_order'} = \@select_form_order;
         my $type_element=          my $type_element=
     &Apache::loncommon::select_form($typeselect,'only',              &Apache::loncommon::select_form(
     %select_file_categories);                  $typeselect,
         $type_element = '<label>'.&mt('File Type Displayed: [_1]',                  'only',
       $type_element).'</label>';                  %select_file_categories);
         $r->print($type_element          my $type_selector = '<label>'.&mt('File Type Displayed: [_1]',
                  .'</fieldset>');                                            $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(
                                              'av' => 'All versions',
                                              'ud' => 'Update Display',
                                              'pr' => 'Problems',
                                              'gr' => 'Graphics',
                                              'at' => 'All types',
                                              'hd' => 'Display Options'
                                              );
           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><b>'.$lt{'hd'}.'</b></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);          $r->print(<<END);
 <br />  <tr>
   <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" />
   </fieldset>
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />  <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />  <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton  $closebutton $groupimportbutton
Line 550  END Line 555  END
  &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);   &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # -------------------------------------------------- Check All and Uncheck all  # -------------------------------------------------- Check All and Uncheck all
  if ($env{'form.catalogmode'} eq 'import') {   if ($env{'form.catalogmode'} eq 'import') {
     $r->print('<br /><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onClick="javascript:checkAll()" />');      $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('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onclick="javascript:uncheckAll()" />');
  }   }
 # ----------------- output starting row to the indexed file/directory hierarchy  # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";          my $titleclr="#ddffff";
Line 584  END Line 589  END
     if ($hash{'display_attrs_11'} == 1);      if ($hash{'display_attrs_11'} == 1);
  $r->print("<td><b>".&mt("Resource")."</b></td>\n")   $r->print("<td><b>".&mt("Resource")."</b></td>\n")
     if ($hash{'display_attrs_7'} == 1);      if ($hash{'display_attrs_7'} == 1);
         $r->print("<th>".&mt("Subject")."</th>\n")          $r->print("<td><b>".&mt("Subject")."</b></td>\n")
             if ($hash{'display_attrs_12'} == 1);              if ($hash{'display_attrs_12'} == 1);
         $r->print("<th>".&mt("Notes")."</th>\n")          $r->print("<td><b>".&mt("Notes")."</b></td>\n")
             if ($hash{'display_attrs_13'} == 1);              if ($hash{'display_attrs_13'} == 1);
         $r->print("<th>".&mt("Abstract")."</th>\n")          $r->print("<td><b>".&mt("Abstract")."</b></td>\n")
             if ($hash{'display_attrs_14'} == 1);              if ($hash{'display_attrs_14'} == 1);
         $r->print("<th>".&mt("Grade Level")."</th>\n")          $r->print("<td><b>".&mt("Grade Level")."</b></td>\n")
             if ($hash{'display_attrs_15'} == 1);              if ($hash{'display_attrs_15'} == 1);
         $r->print("<th>".&mt("Standards")."</th>\n")          $r->print("<td><b>".&mt("Standards")."</b></td>\n")
             if ($hash{'display_attrs_16'} == 1);              if ($hash{'display_attrs_16'} == 1);
  $r->print('</tr>');   $r->print('</tr>');
   
Line 880  sub display_line { Line 885  sub display_line {
  $r->print("<td>\n");   $r->print("<td>\n");
  $r->print ('<form method="post" name="dirpathUP" action="'.$updir.   $r->print ('<form method="post" name="dirpathUP" action="'.$updir.
    '/" '.     '/" '.
    'onSubmit="return rep_dirpath(\'UP\','.     'onsubmit="return rep_dirpath(\'UP\','.
    'document.forms.fileattr.acts.value)" '.     'document.forms.fileattr.acts.value)" '.
    'enctype="application/x-www-form-urlencoded"'.     'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");                     '>'."\n");
Line 889  sub display_line { Line 894  sub display_line {
    $startdir.'" />'."\n");     $startdir.'" />'."\n");
  $r->print ('<input type="hidden" name="acts" value="" />'."\n");   $r->print ('<input type="hidden" name="acts" value="" />'."\n");
  $r->print ('<input src="'.$iconpath.'arrow_up.gif"');   $r->print ('<input src="'.$iconpath.'arrow_up.gif"');
  $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.   $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.
    "\n");     "\n");
  $r->print(&mt("Up")."</form>$tabtag</tr>\n");   $r->print(&mt("Up")."</form>$tabtag</tr>\n");
  return OK;   return OK;
     }      }
 # Do we have permission to look at this?  # 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  # make absolute links appear on different background
     if ($absolute) { $fileclr='#ccdd99'; }      if ($absolute) { $fileclr='#ccdd99'; }
Line 914  sub display_line { Line 919  sub display_line {
  $r->print ('<input type="hidden" name="acts" value="" />');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<input src="'.$iconpath.'folder_pointer_'.   $r->print ('<input src="'.$iconpath.'folder_pointer_'.
    $diropen.'.gif"');      $diropen.'.gif"'); 
  $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.   $r->print (' name="'.$msg.'" alt="'.$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.
Line 942  sub display_line { Line 947  sub display_line {
  $r->print ('<input type="hidden" name="acts" value="" />');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.   $r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.
    '.gif"');      '.gif"'); 
  $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.   $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.
    "\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
Line 988  sub display_line { Line 993  sub display_line {
  } 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"."' ".
       "value='$filelink' onClick='".        "value='$filelink' onclick='".
       "javascript:queue(\"form$fnum\")' ");        "javascript:queue(\"form$fnum\")' ");
     if ($hash{'store_'.$filelink}) {      if ($hash{'store_'.$filelink}) {
  $r->print("checked");   $r->print("checked");
Line 1032  sub display_line { Line 1037  sub display_line {
     $r->print ('<input type="hidden" name="acts" value="" />');      $r->print ('<input type="hidden" name="acts" value="" />');
     $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.      $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
        'folder_pointer_'.$diropen.'.gif"');         'folder_pointer_'.$diropen.'.gif"');
     $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.      $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.
        "\n");         "\n");
  }   }
 # Filetype icons  # Filetype icons
Line 1186  sub display_line { Line 1191  sub display_line {
  $r->print ('<input type="hidden" name="acts" value="" />');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.   $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
    'folder_pointer_'.$diropen.'.gif"');     'folder_pointer_'.$diropen.'.gif"');
  $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.   $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.
    "\n");     "\n");
  my $quotable_curdir = &Apache::loncommon::escape_single($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
  $r->print ('<a href="javascript:gothere(\''   $r->print ('<a href="javascript:gothere(\''
Line 1352  sub begin_form { Line 1357  sub begin_form {
     $uri=&Apache::loncommon::escape_single($uri);      $uri=&Apache::loncommon::escape_single($uri);
     $r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.      $r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.
        '#'.$anchor.         '#'.$anchor.
        '" onSubmit="return rep_dirpath(\''.$dnum.'\''.         '" onsubmit="return rep_dirpath(\''.$dnum.'\''.
        ',document.forms.fileattr.acts.value)" '.         ',document.forms.fileattr.acts.value)" '.
        'enctype="application/x-www-form-urlencoded">'."\n");         'enctype="application/x-www-form-urlencoded">'."\n");
     $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.      $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.

Removed from v.1.181.4.2  
changed lines
  Added in v.1.181.4.5


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