Diff for /loncom/interface/londocs.pm between versions 1.115 and 1.119

version 1.115, 2004/04/07 21:40:21 version 1.119, 2004/04/24 23:03:49
Line 261  sub group_import { Line 261  sub group_import {
 sub breadcrumbs {  sub breadcrumbs {
     my ($where)=@_;      my ($where)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();      &Apache::lonhtmlcommon::clear_breadcrumbs();
     if ($where =~ /^default/) {      my (@folders)=split('&',$ENV{'form.folderpath'});
  &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',      my $folderpath;
     'title'=>'Main Course Documents',      while (@folders) {
     'text' =>'Main Course Documents'});   my $folder=shift(@folders);
     } elsif ($where =~ /^supplemental/) {   my $foldername=shift(@folders);
  &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',   if ($folderpath) {$folderpath.='&';}
     'title'=>'Supplemental Course Documents',   $folderpath.=$folder.'&'.$foldername;
     'text' =>'Supplemental Course Documents'});   my $url='/adm/coursedocs?folderpath='.
       &Apache::lonnet::escape($folderpath);
     } else {  
  &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',  
  'title'=>$where,  
  'text' =>$where});  
     }  
     if ($ENV{'form.foldername'}) {  
  my @folders;  
  if (defined($ENV{'form.folders'})) {  
     @folders=@{$ENV{'form.folders'}};  
  }  
  @folders=(@folders,$ENV{'form.folder'},  
   &Apache::lonnet::escape($ENV{'form.foldername'}));  
   
  my $folderpath;  
  while (@folders) {  
     my $folder=shift(@folders);  
     my $foldername=shift(@folders);  
     if ($folderpath) {$folderpath.='&';}  
     $folderpath.=$folder.'&'.$foldername;  
     my $url='/adm/coursedocs?folderpath='.  
  &Apache::lonnet::escape($folderpath);  
     &Apache::lonhtmlcommon::add_breadcrumb(      &Apache::lonhtmlcommon::add_breadcrumb(
       {'href'=>$url,        {'href'=>$url,
        'title'=>&Apache::lonnet::unescape($foldername),         'title'=>&Apache::lonnet::unescape($foldername),
        'text'=>&Apache::lonnet::unescape($foldername)});         'text'=>'<font size="+1">'.
      &Apache::lonnet::unescape($foldername).'</font>'
          });
                 
       
  }  
     }      }
     return &Apache::lonhtmlcommon::breadcrumbs();      return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef,0);
 }  }
   
 sub editor {  sub editor {
Line 468  sub entryline { Line 448  sub entryline {
     my $line='<tr>';      my $line='<tr>';
 # Edit commands  # Edit commands
     if ($allowed) {      if ($allowed) {
  my %lt=('up' => 'Move Up',   my %lt=&Apache::lonlocal::texthash(
                   'up' => 'Move Up',
  'dw' => 'Move Down',   'dw' => 'Move Down',
  'rm' => 'Remove',   'rm' => 'Remove',
  'rn' => 'Rename');   'rn' => 'Rename');
Line 505  END Line 486  END
           $url='/adm/coursedocs?';            $url='/adm/coursedocs?';
   $folderarg=$1;    $folderarg=$1;
           $isfolder=1;            $isfolder=1;
        } else {         }
   $url=&Apache::lonnet::tokenwrapper($url);  
        }   
     }      }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;      $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {      if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {
Line 522  END Line 501  END
  $url=&Apache::lonnet::clutter($url);   $url=&Apache::lonnet::clutter($url);
  $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);   $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
     }      }
       my $parameterset='';
     if ($isfolder) {      if ($isfolder) {
  my $foldername=&Apache::lonnet::escape($foldertitle);   my $foldername=&Apache::lonnet::escape($foldertitle);
  my $folderpath=$ENV{'form.folderpath'};   my $folderpath=$ENV{'form.folderpath'};
  if ($folderpath) { $folderpath.='&' };   if ($folderpath) { $folderpath.='&' };
  $folderpath.=$folderarg.'&'.$foldername;   $folderpath.=$folderarg.'&'.$foldername;
  $url.='folderpath='.&Apache::lonnet::escape($folderpath);   $url.='folderpath='.&Apache::lonnet::escape($folderpath);
    $parameterset='';
     }      }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.      $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
  '" border="0"></a></td>'.   '" border="0"></a></td>'.
         "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td></tr>";          "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>";
       if ($allowed) {
    my %lt=&Apache::lonlocal::texthash(
         'hd' => 'Hidden',
         'ec' => 'URL hidden',
         'rp' => 'Randomly Pick Number of Resources',
         'sp' => 'Store Parameters');
       }
       $line.="</tr>";
     return $line;      return $line;
 }  }
   
Line 896  sub changewarning { Line 885  sub changewarning {
     $r->print(      $r->print(
 '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'.   '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
 '<form method="post" action="/adm/roles" target="loncapaclient">'.  '<form method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.  '<input type="hidden" name="orgurl" value="/adm/coursedocs?folderpath='.
   &Apache::lonnet::escape($ENV{'form.folderpath'}).
   '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
 &mt('Changes will become active for your current session after').  &mt('Changes will become active for your current session after').
 ' <input type="hidden" name="'.  ' <input type="hidden" name="'.
 $ENV{'request.role'}.'" value="1" /><input type="button" value="'.  $ENV{'request.role'}.'" value="1" /><input type="button" value="'.
Line 954  sub handler { Line 945  sub handler {
  my (@folderpath)=split('&',$ENV{'form.folderpath'});   my (@folderpath)=split('&',$ENV{'form.folderpath'});
  $ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));   $ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
  $ENV{'form.folder'}=pop(@folderpath);   $ENV{'form.folder'}=pop(@folderpath);
  $ENV{'form.folders'}=\@folderpath;      } 
     }  
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {      if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
        $showdoc=$1;         $showdoc=$1;
     }      }
Line 1147  ENDNEWSCRIPT Line 1137  ENDNEWSCRIPT
  'vc' => 'Verify Content',   'vc' => 'Verify Content',
  'cv' => 'Check/Set Resource Versions',   'cv' => 'Check/Set Resource Versions',
   );    );
   
          my $folderpath=$ENV{'form.folderpath'};
          if (!$folderpath) {
      if ($ENV{'form.folder'} eq '' ||
          $ENV{'form.folder'} eq 'supplemental') {
          $folderpath='default&'.
      &Apache::lonnet::escape(&mt('Main Course Documents'));
      }
          }
        $r->print(<<ENDCOURSEVERIFY);         $r->print(<<ENDCOURSEVERIFY);
 <form name="renameform" method="post" action="/adm/coursedocs">  <form name="renameform" method="post" action="/adm/coursedocs">
 <input type="hidden" name="title" />  <input type="hidden" name="title" />
Line 1155  ENDNEWSCRIPT Line 1154  ENDNEWSCRIPT
 </form>  </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">  <form name="simpleedit" method="post" action="/adm/coursedocs">
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  <input type="hidden" name="folderpath" value="$folderpath" />
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="courseverify">  <form action="/adm/coursedocs" method="post" name="courseverify">
 <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">  <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
Line 1171  ENDCOURSEVERIFY Line 1170  ENDCOURSEVERIFY
      &mt('Editing the Table of Contents for your Course')));       &mt('Editing the Table of Contents for your Course')));
     }      }
 # --------------------------------------------------------- Standard documents  # --------------------------------------------------------- Standard documents
     #my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');  
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');      $r->print('<table border=2 cellspacing=4 cellpadding=4>');
     if (($standard) && ($allowed) && (!$forcesupplement)) {      if (($standard) && ($allowed) && (!$forcesupplement)) {
        $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').   $r->print('<tr><td bgcolor="#BBBBBB">');
   ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');  #  '<h2>'.&mt('Main Course Documents').
   #  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};         my $folder=$ENV{'form.folder'};
        if ($folder eq '') {         if ($folder eq '' || $folder eq 'supplemental') {
            $folder='default';             $folder='default';
      $ENV{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents'));
        }         }
        my $postexec='';         my $postexec='';
        if ($folder eq 'default') {         if ($folder eq 'default') {
    $r->print('<script>this.window.name="loncapaclient";</script>');     $r->print('<script>this.window.name="loncapaclient";</script>');
        } else {         } else {
            $postexec='self.close();';             #$postexec='self.close();';
        }         }
        $hadchanges=0;         $hadchanges=0;
        &editor($r,$coursenum,$coursedom,$folder,$allowed);         &editor($r,$coursenum,$coursedom,$folder,$allowed);
Line 1319  onClick="javascript:makeabout();" /> Line 1319  onClick="javascript:makeabout();" />
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/imsimportdocs" method="post" name="ims">  <form action="/adm/imsimportdocs" method="post" name="ims">
 <input type="hidden" name="folder" value="$ENV{'form.folder'}" />  <input type="hidden" name="folder" value="$folder" />
 <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />  <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
 </nobr>  </nobr>
 </form>  </form>
Line 1330  ENDFORM Line 1330  ENDFORM
     }      }
 # ----------------------------------------------------- Supplemental documents  # ----------------------------------------------------- Supplemental documents
     if (!$forcestandard) {      if (!$forcestandard) {
        $r->print(         $r->print('<tr><td bgcolor="#BBBBBB">');
   '<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Supplemental Course Documents').  # '<h2>'.&mt('Supplemental Course Documents').
   ($allowed?' '.$help{'Supplemental'}:'').'</h2>');  #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};         my $folder=$ENV{'form.folder'};
        unless ($folder=~/supplemental/) { $folder='supplemental'; }         unless ($folder=~/^supplemental/) {
      $folder='supplemental';
          }
          if ($folder =~ /^supplemental$/ &&
      $ENV{'form.folderpath'} =~ /^default\&/) {
      $ENV{'form.folderpath'}='supplemental&'.
          &Apache::lonnet::escape(&mt('Supplemental Course Documents'));
          }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);         &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($allowed) {         if ($allowed) {
        my $folderseq=         my $folderseq=

Removed from v.1.115  
changed lines
  Added in v.1.119


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