[BACK]Return to lonindexer.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonindexer.pm between versions 1.198 and 1.199

version 1.198, 2009/07/03 09:59:06 version 1.199, 2009/07/17 15:42:07
Line 184  ENDSUBM Line 184  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 196  END Line 196  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 361  END Line 361  END
                   
  my $js = <<"ENDHEADER";   my $js = <<"ENDHEADER";
 <script type="text/javascript">  <script type="text/javascript">
   // <![CDATA[
 $catalogmodefunctions;  $catalogmodefunctions;
 function update_only(field) {  function update_only(field) {
     alert(field.name);      alert(field.name);
Line 405  function openWindow(url, wdwName, w, h, Line 406  function openWindow(url, wdwName, w, h,
 function gothere(val) {  function gothere(val) {
     window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;      window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;
 }  }
   // ]]>
 </script>  </script>
 ENDHEADER  ENDHEADER
   
Line 446  ENDHEADER Line 448  ENDHEADER
     }      }
  } 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;
     }      }
  }   }
   
Line 478  ENDHEADER Line 480  ENDHEADER
    'hd' => 'Display Options'     'hd' => 'Display Options'
    );     );
  $r->print(<<END);   $r->print(<<END);
   <form method="post" name="fileattr" action="$uri" enctype="application/x-www-form-urlencoded">
 <fieldset>  <fieldset>
 <legend>$lt{'hd'}</legend>  <legend>$lt{'hd'}</legend>
 <form method="post" name="fileattr" action="$uri"  <label><input type="checkbox" name="attr9" value="1" $attrchk[9] onclick="this.form.submit();" /> $lt{'av'}</label>
  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">  <table border="0">
 <tr>  <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="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="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="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>  <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>
 <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="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="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>  <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><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 529  END Line 530  END
         $r->print($type_element          $r->print($type_element
                  .'</fieldset>');                   .'</fieldset>');
         $r->print(<<END);          $r->print(<<END);
 <br />  
 <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 563  END Line 563  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
         #$r->print(&initdebug());          #$r->print(&initdebug());
Line 897  sub display_line { Line 897  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 905  sub display_line { Line 905  sub display_line {
  $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 ('<a href="#" onclick="document.dirpathUP.submit()"><img src="'.$iconpath.'arrow.up.gif"');
  $r->print (' name="'.$msg.'" type="image" class="LC_fileicon" />'.   $r->print (' alt="'.$msg.'" class="LC_fileicon" />'.
    "\n");     "\n");
  $r->print(&mt("Up")."</a></form>$tabtag");   $r->print(&mt("Up")."</a></form>$tabtag");
         $r->print(&Apache::loncommon::end_data_table_row());          $r->print(&Apache::loncommon::end_data_table_row());
Line 932  sub display_line { Line 932  sub display_line {
  $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 ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"'); 
  $r->print (' name="'.$msg.'" type="image" class="LC_fileicon" /></a>'.   $r->print (' alt="'.$msg.'" class="LC_fileicon" /></a>'.
    "\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 962  $r->print ('<input type="hidden" name="a Line 962  $r->print ('<input type="hidden" name="a
  $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");     'whitespace_21.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 ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()">');
         $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).          $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
    '.gif" class="LC_fileicon"');      '.gif" class="LC_fileicon"'); 
  $r->print (' name="'.$msg.'"/></a>'.   $r->print (' alt="'.$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
Line 1010  $r->print ('<input type="hidden" name="a Line 1010  $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('</td><td class="LC_middle">');
  } 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");
     }      }
     $r->print(" />\n");      $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}_link"}=$filelink;
     $hash{"pre_${fnum}_title"}=$title;      $hash{"pre_${fnum}_title"}=$title;
     if (!$hash{"pre_${fnum}_title"}) {      if (!$hash{"pre_${fnum}_title"}) {
Line 1037  $r->print ('<input type="hidden" name="a Line 1037  $r->print ('<input type="hidden" name="a
 # General indentation  # General indentation
     my $count = 0;      my $count = 0;
     while ($count < $indent) {      while ($count < $indent) {
  $r->print("<img alt=\"\" src=".$iconpath.              $r->print('<img alt="" src="'.$iconpath.'whitespace_21.gif" 
   "whitespace_21.gif class='LC_icon' />\n");                  class="LC_icon" />');
         $count++;          $count++;
     }      }
 # Sequence open/close icon  # Sequence open/close icon
Line 1048  $r->print ('<input type="hidden" name="a Line 1048  $r->print ('<input type="hidden" name="a
     $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>');
             $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" ).              $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
                        '.gif" class="LC_fileicon"');                         '.gif" class="LC_fileicon"');
     $r->print (' name="'.$msg.'" type="image" class="LC_fileicon" /></a>'.      $r->print (' alt="'.$msg.'" /></a>'.
        "\n");         "\n");
  }   }
 # Filetype icons  # Filetype icons
Line 1070  $r->print ('<input type="hidden" name="a Line 1070  $r->print ('<input type="hidden" name="a
  if ($filelink=~/\.(page|sequence)$/) {   if ($filelink=~/\.(page|sequence)$/) {
     $r->print('</form>');      $r->print('</form>');
  }   }
  $r->print("</span></td>\n");   $r->print("</td>\n");
  if ($hash{'display_attrs_0'} == 1) {   if ($hash{'display_attrs_0'} == 1) {
     $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).      $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
       ' </td>'."\n");        ' </td>'."\n");
Line 1147  $r->print ('<input type="hidden" name="a Line 1147  $r->print ('<input type="hidden" name="a
  if ($hash{'display_attrs_7'} == 1) {   if ($hash{'display_attrs_7'} == 1) {
 # Show resource  # Show resource
    my $output=&showpreview($filelink);     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");        " </td>\n");
     }      }
           
Line 1199  $r->print ('<input type="hidden" name="a Line 1199  $r->print ('<input type="hidden" name="a
  my $indentm1 = $indent-1;   my $indentm1 = $indent-1;
  my $count = 0;   my $count = 0;
  while ($count < $indentm1) {   while ($count < $indentm1) {
     $r->print ("<img alt=\"\" src=",$iconpath      $r->print ('<img alt="" src="',$iconpath
                ,"whitespace_21.gif class='LC_icon' />\n");                 ,'whitespace_21.gif" class="LC_icon" />');
             $count++;              $count++;
  }   }
  $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>');
         $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"');     'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"');
  $r->print (' name="'.$msg.'" class="LC_fileicon" /></a>'.   $r->print (' alt="'.$msg.'" class="LC_fileicon" /></a>'.
    "\n");     "\n");
  my $quotable_curdir = &Apache::loncommon::escape_single($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
                   
Line 1346  sub showpreview { Line 1346  sub showpreview {
              close(FH);               close(FH);
           }            }
        }         }
        $output='<span class="LC_fontsize_medium">'.$output.'</span>';  
     } 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)/}) {
Line 1377  sub begin_form { Line 1376  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.198  
changed lines
  Added in v.1.199

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