Diff for /loncom/interface/lonindexer.pm between versions 1.144 and 1.145

version 1.144, 2006/06/08 07:20:41 version 1.145, 2006/06/08 13:56:31
Line 179  ENDSUBM Line 179  ENDSUBM
 <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 'groupimport') {   elsif ($env{'form.catalogmode'} eq 'import') {
     $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.      $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
  '<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.   '<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
  ' border="0" /></td>';   ' border="0" /></td>';
Line 229  END Line 229  END
 # ------ set catalogmodefunctions to have extra needed javascript functionality  # ------ set catalogmodefunctions to have extra needed javascript functionality
  my $catalogmodefunctions='';   my $catalogmodefunctions='';
  if ($env{'form.catalogmode'} eq 'interactive' or   if ($env{'form.catalogmode'} eq 'interactive' or
     $env{'form.catalogmode'} eq 'groupimport') {      $env{'form.catalogmode'} eq 'import') {
     # The if statement below sets us up to use the old version      # The if statement below sets us up to use the old version
     # by default (ie. if $mode is undefined).  This is the easy      # by default (ie. if $mode is undefined).  This is the easy
     # way out.  Hopefully in the future I'll find a way to get       # way out.  Hopefully in the future I'll find a way to get 
Line 240  END Line 240  END
 #  #
 #  #
     if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {      if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {
                 my $location = "/adm/groupsort?catalogmode=groupimport&";                  my $location = "/adm/groupsort?catalogmode=import&";
                 $location .= "mode=".$mode."&";                  $location .= "mode=".$mode."&";
                 $location .= "acts=";                  $location .= "acts=";
  $catalogmodefunctions=<<"END";   $catalogmodefunctions=<<"END";
Line 327  function rep_dirpath(suffix,val) { Line 327  function rep_dirpath(suffix,val) {
     eval("document.forms.dirpath"+suffix+".acts.value=val");      eval("document.forms.dirpath"+suffix+".acts.value=val");
 }  }
 END  END
  if ($env{'form.catalogmode'} eq 'groupimport') {   if ($env{'form.catalogmode'} eq 'import') {
             $catalogmodefunctions.=<<END;              $catalogmodefunctions.=<<END;
 function queue(val) {  function queue(val) {
     if (eval("document.forms."+val+".filelink.checked")) {      if (eval("document.forms."+val+".filelink.checked")) {
Line 369  ENDHEADER Line 369  ENDHEADER
  $r->print(&Apache::loncommon::start_page('Browse Resources',$js,   $r->print(&Apache::loncommon::start_page('Browse Resources',$js,
  {'domain' => $headerdom,}));   {'domain' => $headerdom,}));
 # - Evaluate actions from previous page (both cumulatively and chronologically)  # - Evaluate actions from previous page (both cumulatively and chronologically)
         if ($env{'form.catalogmode'} eq 'groupimport') {          if ($env{'form.catalogmode'} eq 'import') {
     my $acts=$env{'form.acts'};      my $acts=$env{'form.acts'};
     my @Acts=split(/b/,$acts);      my @Acts=split(/b/,$acts);
     my %ahash;      my %ahash;
Line 478  END Line 478  END
  $storeuri=~s/\/+/\//g;   $storeuri=~s/\/+/\//g;
 # ---------------------------------------------------------------- Bread crumbs  # ---------------------------------------------------------------- Bread crumbs
         $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','',          $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','',
  (($env{'form.catalogmode'} eq 'groupimport')?   (($env{'form.catalogmode'} eq 'import')?
  'document.forms.fileattr':'')).   'document.forms.fileattr':'')).
   &Apache::lonhtmlcommon::select_recent('residx','resrecent',    &Apache::lonhtmlcommon::select_recent('residx','resrecent',
 'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));  'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));
Line 486  END Line 486  END
  my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};   my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
  if ($reshome) {   if ($reshome) {
     $r->print("<font size='+2'><a href='");      $r->print("<font size='+2'><a href='");
     if ($env{'form.catalogmode'} eq 'groupimport') {      if ($env{'form.catalogmode'} eq 'import') {
  $r->print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();');   $r->print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();');
     } else {      } else {
  $r->print($reshome);   $r->print($reshome);
Line 912  sub display_line { Line 912  sub display_line {
     $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".      $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
       "\n");        "\n");
     $r->print("</td><td nowrap>");      $r->print("</td><td nowrap>");
  } elsif ($env{'form.catalogmode'} eq 'groupimport') {   } elsif ($env{'form.catalogmode'} eq 'import') {
     $r->print("<form name='form$fnum'>\n");      $r->print("<form name='form$fnum'>\n");
     $r->print("<input type='checkbox' name='filelink"."' ".      $r->print("<input type='checkbox' name='filelink"."' ".
       "value='$filelink' onClick='".        "value='$filelink' onClick='".
Line 1188  sub dynmetaprint { Line 1188  sub dynmetaprint {
  $r->print("\n<br />".$fieldnames{$item}.': '.   $r->print("\n<br />".$fieldnames{$item}.': '.
   &Apache::lonmeta::prettyprint($item,    &Apache::lonmeta::prettyprint($item,
  $dynhash{$filelink}->{$item},   $dynhash{$filelink}->{$item},
   (($env{'form.catalogmode'} ne 'groupimport')?'preview':''),    (($env{'form.catalogmode'} ne 'import')?'preview':''),
   '',    '',
   (($env{'form.catalogmode'} eq 'groupimport')?'document.forms.fileattr':''),1));    (($env{'form.catalogmode'} eq 'import')?'document.forms.fileattr':''),1));
     }      }
 }  }
   

Removed from v.1.144  
changed lines
  Added in v.1.145


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