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

Diff for /loncom/interface/londocs.pm between versions 1.138 and 1.142

version 1.138, 2004/08/22 18:15:54 version 1.142, 2004/09/14 01:21:49
Line 440  sub group_import { Line 440  sub group_import {
     my $coursenum = shift;      my $coursenum = shift;
     my $coursedom = shift;      my $coursedom = shift;
     my $folder = shift;      my $folder = shift;
       my $container = shift;
       my $caller = shift;
     while (@_) {      while (@_) {
  my $name = shift;   my $name = shift;
  my $url = shift;   my $url = shift;
           if (($url =~ m#^/uploaded/$coursedom/$coursenum/(default_\d+\.)(page|sequence)$#) && ($caller eq 'londocs')) {
               my $errtext = '';
               my $fatal = 0;
               my $newmapstr = '<map>'."\n".
                               '<resource id="1" src="" type="start"></resource>'."\n".
                               '<link from="1" to="2" index="1"></link>'."\n".
                               '<resource id="2" src="" type="finish"></resource>'."\n".
                               '</map>';
               $ENV{'form.output'}=$newmapstr;
               my $home=&Apache::lonnet::homeserver($coursenum,$coursedom);
               my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$home,
                                                   'output',$1.$2);
               if ($result != m|^/uploaded/|) {
                   $errtext.='Map not saved: A network error occured when trying to save the new map. ';
                   $fatal = 2;
               }
               if ($fatal) {
                   return ($errtext,$fatal);
               }
           }
  if ($url) {   if ($url) {
     my $idx = $#Apache::lonratedt::resources + 1;      my $idx = $#Apache::lonratedt::resources + 1;
     $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;      $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;
Line 454  sub group_import { Line 476  sub group_import {
  join ':', ($name, $url, $ext, 'normal', 'res');   join ':', ($name, $url, $ext, 'normal', 'res');
  }   }
     }      }
     return &storemap($coursenum, $coursedom, $folder.'.sequence');      return &storemap($coursenum, $coursedom, $folder.'.'.$container);
 }  }
   
 sub breadcrumbs {  sub breadcrumbs {
     my ($where)=@_;      my ($where)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();      &Apache::lonhtmlcommon::clear_breadcrumbs();
     my (@folders)=split('&',$ENV{'form.folderpath'});      my (@folders);
       if ($ENV{'form.pagepath'}) {
           @folders = split('&',$ENV{'form.pagepath'});
       } else {
           @folders=split('&',$ENV{'form.folderpath'});
       }
     my $folderpath;      my $folderpath;
     while (@folders) {      while (@folders) {
  my $folder=shift(@folders);   my $folder=shift(@folders);
Line 488  sub editor { Line 515  sub editor {
     $r->print(&breadcrumbs($folder));      $r->print(&breadcrumbs($folder));
     my $errtext='';      my $errtext='';
     my $fatal=0;      my $fatal=0;
       my $container='sequence';
       if ($ENV{'form.pagepath'}) {
           $container='page';
       }
     ($errtext,$fatal)=      ($errtext,$fatal)=
           &mapread($coursenum,$coursedom,$folder.'.sequence');                &mapread($coursenum,$coursedom,$folder.'.'.$container);
     if ($#Apache::lonratedt::order<1) {      if ($#Apache::lonratedt::order<1) {
         $Apache::lonratedt::order[0]=1;          $Apache::lonratedt::order[0]=1;
         $Apache::lonratedt::resources[1]='';          $Apache::lonratedt::resources[1]='';
Line 557  sub editor { Line 588  sub editor {
  }   }
 # store the changed version  # store the changed version
   
  ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');   ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
  if ($fatal) {   if ($fatal) {
     $r->print('<p><font color="red">'.$errtext.'</font></p>');      $r->print('<p><font color="red">'.$errtext.'</font></p>');
     return;      return;
Line 589  sub editor { Line 620  sub editor {
               $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=                $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
                                                               $newidx;                                                                       $newidx;       
   
       ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');        ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
       if ($fatal) {        if ($fatal) {
   $r->print('<p><font color="red">'.$errtext.'</font></p>');    $r->print('<p><font color="red">'.$errtext.'</font></p>');
   return;    return;
Line 623  sub editor { Line 654  sub editor {
                     $Apache::lonratedt::order[$idx]=$i;                      $Apache::lonratedt::order[$idx]=$i;
    }     }
                 } elsif ($cmd eq 'rename') {                  } elsif ($cmd eq 'rename') {
                       my $ratstr = $Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]];
                     my ($rtitle,@rrest)=split(/\:/,                      my ($rtitle,@rrest)=split(/\:/,
                        $Apache::lonratedt::resources[                         $Apache::lonratedt::resources[
        $Apache::lonratedt::order[$idx]]);         $Apache::lonratedt::order[$idx]]);
Line 638  sub editor { Line 670  sub editor {
                 }                  }
 # Store the changed version  # Store the changed version
  ($errtext,$fatal)=&storemap($coursenum,$coursedom,   ($errtext,$fatal)=&storemap($coursenum,$coursedom,
     $folder.'.sequence');      $folder.'.'.$container);
  if ($fatal) {   if ($fatal) {
     $r->print('<p><font color="red">'.$errtext.'</font></p>');      $r->print('<p><font color="red">'.$errtext.'</font></p>');
     return;      return;
Line 657  sub editor { Line 689  sub editor {
  }   }
 # Store the changed version  # Store the changed version
  ($errtext,$fatal)=group_import($coursenum, $coursedom, $folder,   ($errtext,$fatal)=group_import($coursenum, $coursedom, $folder,
        @imports);         $container,'londocs',@imports);
  if ($fatal) {   if ($fatal) {
     $r->print('<p><font color="red">'.$errtext.'</font></p>');      $r->print('<p><font color="red">'.$errtext.'</font></p>');
     return;      return;
Line 675  sub editor { Line 707  sub editor {
   
 # Store the changed version  # Store the changed version
        ($errtext,$fatal)=&storemap($coursenum,$coursedom,         ($errtext,$fatal)=&storemap($coursenum,$coursedom,
    $folder.'.sequence');     $folder.'.'.$container);
        if ($fatal) {         if ($fatal) {
    $r->print('<p><font color="red">'.$errtext.'</font></p>');     $r->print('<p><font color="red">'.$errtext.'</font></p>');
    return;     return;
Line 709  sub entryline { Line 741  sub entryline {
      &Apache::lonnet::unescape($title)),'"<>&\'');       &Apache::lonnet::unescape($title)),'"<>&\'');
     my $renametitle=$title;      my $renametitle=$title;
     my $foldertitle=$title;      my $foldertitle=$title;
       my $pagetitle=$title;
     my $orderidx=$Apache::lonratedt::order[$index];      my $orderidx=$Apache::lonratedt::order[$index];
     if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/ ) {       if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/ ) { 
  $foldertitle=&Apache::lontexconvert::msgtexconverted($4);   $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
Line 720  sub entryline { Line 753  sub entryline {
     $renametitle=~s/\&quot\;/\\\"/g;      $renametitle=~s/\&quot\;/\\\"/g;
     my $line='<tr>';      my $line='<tr>';
 # Edit commands  # Edit commands
       my $container;
     my $folderpath;      my $folderpath;
     if ($ENV{'form.folderpath'}) {      if ($ENV{'form.folderpath'}) {
           $container = 'sequence';
  $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'});   $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'});
  # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');   # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
     }      }
       my $pagepath;
       if ($ENV{'form.pagepath'}) {
           $container = 'page';
           $pagepath=&Apache::lonnet::escape($ENV{'form.pagepath'});
       }
     if ($allowed) {      if ($allowed) {
  my $incindex=$index+1;   my $incindex=$index+1;
  my $selectbox='';   my $selectbox='';
Line 746  sub entryline { Line 786  sub entryline {
  'dw' => 'Move Down',   'dw' => 'Move Down',
  'rm' => 'Remove',   'rm' => 'Remove',
  'rn' => 'Rename');   'rn' => 'Rename');
  $line.=(<<END);          if ($ENV{'form.pagepath'}) {
               $line.=(<<END);
   <form name="entry_$index" action="/adm/coursedocs" method="post">
   <input type="hidden" name="pagepath" value="$ENV{'form.pagepath'}" />
   <input type="hidden" name="setparms" value="$orderidx" />
   <td><table border='0' cellspacing='2' cellpadding='0'>
   <tr><td bgcolor="#DDDDDD">
   <a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath'>
   <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
   <tr><td bgcolor="#DDDDDD">
   <a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath'>
   <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
   </table></td>
   <td>$selectbox
   </td><td bgcolor="#DDDDDD">
   <a href='javascript:removeres("$pagepath","$index","$renametitle","page");'>
   <font size="-2" color="#990000">$lt{'rm'}</font></a>
   <a href='javascript:changename("$pagepath","$index","$renametitle","page");'>
   <font size="-2" color="#009900">$lt{'rn'}</font></a></td>
   END
           } else {
               $line.=(<<END); 
 <form name="entry_$index" action="/adm/coursedocs" method="post">  <form name="entry_$index" action="/adm/coursedocs" method="post">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="setparms" value="$orderidx" />  <input type="hidden" name="setparms" value="$orderidx" />
Line 760  sub entryline { Line 821  sub entryline {
 </table></td>  </table></td>
 <td>$selectbox  <td>$selectbox
 </td><td bgcolor="#DDDDDD">  </td><td bgcolor="#DDDDDD">
 <a href='javascript:removeres("$folderpath","$index","$renametitle");'>  <a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'>
 <font size="-2" color="#990000">$lt{'rm'}</font></a>  <font size="-2" color="#990000">$lt{'rm'}</font></a>
 <a href='javascript:changename("$folderpath","$index","$renametitle");'>  <a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'>
 <font size="-2" color="#009900">$lt{'rn'}</font></a></td>  <font size="-2" color="#009900">$lt{'rn'}</font></a></td>
 END  END
           }
     }      }
 # Figure out what kind of a resource this is  # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);      my ($extension)=($url=~/\.(\w+)$/);
     my $uploaded=($url=~/^\/*uploaded\//);      my $uploaded=($url=~/^\/*uploaded\//);
     my $icon=&Apache::loncommon::icon($url);      my $icon=&Apache::loncommon::icon($url);
     my $isfolder=0;      my $isfolder=0;
       my $ispage=0;
     my $folderarg;      my $folderarg;
       my $pagearg;
       my $pagefile;
     if ($uploaded) {      if ($uploaded) {
  if ($extension eq 'sequence') {   if ($extension eq 'sequence') {
     $icon=$iconpath.'/folder_closed.gif';      $icon=$iconpath.'/folder_closed.gif';
Line 779  END Line 844  END
     $url='/adm/coursedocs?';      $url='/adm/coursedocs?';
     $folderarg=$1;      $folderarg=$1;
     $isfolder=1;      $isfolder=1;
           } elsif ($extension eq 'page') {
               $icon=$iconpath.'/page.gif';
               $url=~/$coursenum\/([\/\w]+)\.page$/;
               $pagearg=$1;
               $url='/adm/coursedocs?';
               $ispage=1;
  } else {   } else {
     &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);      &Apache::lonnet::allowuploaded('/adm/coursedoc',$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/) && (!$ispage)) {
  my $symb=&Apache::lonnet::symbclean(   my $symb=&Apache::lonnet::symbclean(
           &Apache::lonnet::declutter('uploaded/'.            &Apache::lonnet::declutter('uploaded/'.
            $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.             $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
Line 805  END Line 876  END
  $url='/adm/coursedocs/showdoc'.$url;   $url='/adm/coursedocs/showdoc'.$url;
     }      }
  }   }
  $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);          unless ($container eq 'page') {
       $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
           }
     }      }
     my $parameterset='&nbsp;';      my $parameterset='&nbsp;';
     if ($isfolder) {      if ($isfolder) {
Line 818  END Line 891  END
     '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.      '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
     (&Apache::lonratedt::getparameter($orderidx,'parameter_randompick'))[0].'" />';      (&Apache::lonratedt::getparameter($orderidx,'parameter_randompick'))[0].'" />';
     }      }
       if ($ispage) {
           my $pagename=&Apache::lonnet::escape($pagetitle);
           my $pagepath;
           my $folderpath=$ENV{'form.folderpath'};
           if ($folderpath) { $pagepath = $folderpath.'&' };
           $pagepath.=$pagearg.'&'.$pagename;
           $url.='pagepath='.&Apache::lonnet::escape($pagepath);
       }
     $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>";          "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>";
Line 833  END Line 914  END
  $line.=(<<ENDPARMS);   $line.=(<<ENDPARMS);
 <td bgcolor="#BBBBFF"><font size='-2'>  <td bgcolor="#BBBBFF"><font size='-2'>
 <input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</td>  <input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</td>
 <td bgcolor="#BBBBFF"><font size='-2'>  <!--<td bgcolor="#BBBBFF"><font size='-2'>
 <input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</td>  <input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</td>-->
 <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>  <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
 <td bgcolor="#BBBBFF"><font size='-2'>  <td bgcolor="#BBBBFF"><font size='-2'>
 <input type="submit" value="$lt{'sp'}" />  <input type="submit" value="$lt{'sp'}" />
Line 874  sub untiehash { Line 955  sub untiehash {
   
 sub checkonthis {  sub checkonthis {
     my ($r,$url,$level,$title)=@_;      my ($r,$url,$level,$title)=@_;
       $url=&Apache::lonnet::unescape($url);
     $alreadyseen{$url}=1;      $alreadyseen{$url}=1;
     $r->rflush();      $r->rflush();
     if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {      if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
Line 960  sub verifycontent { Line 1042  sub verifycontent {
    %alreadyseen=();     %alreadyseen=();
    &tiehash();     &tiehash();
    foreach (keys %hash) {     foreach (keys %hash) {
        if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {         if ($hash{$_}=~/\.(page|sequence)$/) {
      if (($_=~/^src_/) && ($alreadyseen{&Apache::lonnet::unescape($hash{$_})})) {
          $r->print('<hr /><font color="red">'.
    &mt('The following sequence or page is included more than once in your course: ').
    &Apache::lonnet::unescape($hash{$_}).'</font><br />'.
    &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
      }
          }
          if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&Apache::lonnet::unescape($hash{$_})})) {
            &checkonthis($r,$hash{$_},0,$hash{'title_'.$1});             &checkonthis($r,$hash{$_},0,$hash{'title_'.$1});
        }         }
    }     }
Line 1262  sub handler { Line 1352  sub handler {
   foreach ('Adding_Course_Doc','Main_Course_Documents',    foreach ('Adding_Course_Doc','Main_Course_Documents',
            'Adding_External_Resource','Navigate_Content',             'Adding_External_Resource','Navigate_Content',
            'Adding_Folders','Docs_Overview', 'Load_Map',             'Adding_Folders','Docs_Overview', 'Load_Map',
            'Supplemental', 'Score_Upload_Form',             'Supplemental','Score_Upload_Form','Adding_Pages',
            'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',             'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
    'Check_Resource_Versions','Verify_Content') {     'Check_Resource_Versions','Verify_Content') {
       $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);        $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
Line 1279  sub handler { Line 1369  sub handler {
     $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(      $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
   'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');    'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');      $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
    
   if ($ENV{'form.verify'}) {    if ($ENV{'form.verify'}) {
       &verifycontent($r);        &verifycontent($r);
   } elsif ($ENV{'form.versions'}) {    } elsif ($ENV{'form.versions'}) {
Line 1298  sub handler { Line 1388  sub handler {
     my $allowed;      my $allowed;
     my $events='';      my $events='';
     my $showdoc=0;      my $showdoc=0;
       my $containertag;
       my $uploadtag;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
     ['folderpath']);      ['folderpath','pagepath']);
     if ($ENV{'form.folderpath'}) {      if ($ENV{'form.folderpath'}) {
  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);
     }       }
       if ($ENV{'form.pagepath'}) {
           my (@pagepath)=split('&',$ENV{'form.pagepath'});
           $ENV{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath));
           $ENV{'form.folder'}=pop(@pagepath);
           $containertag = '<input type="hidden" name="pagepath" value="" />';
           $uploadtag = '<input type="hidden" name="pagepath" value="'.$ENV{'form.pagepath'}.'" />';
       }
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {      if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
        $showdoc='/'.$1;         $showdoc='/'.$1;
     }      }
Line 1362  function makenewfolder(targetform,folder Line 1461  function makenewfolder(targetform,folder
     }      }
 }  }
   
   function makenewpage(targetform,folderseq) {
       var pagename=prompt('Name of New Page','New Page');
       if (pagename) {
           targetform.importdetail.value=pagename+"="+folderseq;
           targetform.submit();
       }
   }
   
 function makenewext(targetname) {  function makenewext(targetname) {
     this.document.forms.extimport.useform.value=targetname;      this.document.forms.extimport.useform.value=targetname;
     window.open('/adm/rat/extpickframe.html');      window.open('/adm/rat/extpickframe.html');
Line 1435  function finishpick() { Line 1542  function finishpick() {
     '";this.document.forms.'+form+'.submit();');      '";this.document.forms.'+form+'.submit();');
 }  }
   
 function changename(folderpath,index,oldtitle) {  function changename(folderpath,index,oldtitle,container) {
     var title=prompt('New Title',oldtitle);      var title=prompt('New Title',oldtitle);
     if (title) {      if (title) {
  this.document.forms.renameform.title.value=title;   this.document.forms.renameform.title.value=title;
  this.document.forms.renameform.cmd.value='rename_'+index;   this.document.forms.renameform.cmd.value='rename_'+index;
  this.document.forms.renameform.folderpath.value=folderpath;          if (container == 'sequence') {
       this.document.forms.renameform.folderpath.value=folderpath;
           }
           if (container == 'page') {
               this.document.forms.renameform.pagepath.value=folderpath;
           }
         this.document.forms.renameform.submit();          this.document.forms.renameform.submit();
     }      }
 }  }
   
 function removeres(folderpath,index,oldtitle) {  function removeres(folderpath,index,oldtitle,container) {
     if (confirm('Remove "'+oldtitle+'"?')) {      if (confirm('Remove "'+oldtitle+'"?')) {
  this.document.forms.renameform.cmd.value='del_'+index;   this.document.forms.renameform.cmd.value='del_'+index;
  this.document.forms.renameform.folderpath.value=folderpath;          if (container == 'sequence') {
               this.document.forms.renameform.folderpath.value=folderpath;
           }
           if (container == 'page') {
               this.document.forms.renameform.pagepath.value=folderpath;
           }
         this.document.forms.renameform.submit();          this.document.forms.renameform.submit();
     }      }
 }  }
Line 1475  ENDNEWSCRIPT Line 1592  ENDNEWSCRIPT
                 'selm' => 'Select Map',                  'selm' => 'Select Map',
                 'load' => 'Load Map',                  'load' => 'Load Map',
                 'newf' => 'New Folder',                  'newf' => 'New Folder',
                   'newp' => 'New Composite Page',
                 'extr' => 'External Resource',                  'extr' => 'External Resource',
                 'syll' => 'Syllabus',                  'syll' => 'Syllabus',
                 'navc' => 'Navigate Contents',                  'navc' => 'Navigate Contents',
Line 1506  ENDNEWSCRIPT Line 1624  ENDNEWSCRIPT
    &Apache::lonnet::escape(&mt('Main Course Documents'));     &Apache::lonnet::escape(&mt('Main Course Documents'));
    }     }
        }         }
          unless ($ENV{'form.pagepath'}) {
              $containertag = '<input type="hidden" name="folderpath" value="" />';
              $uploadtag = '<input type="hidden" name="folderpath" value="'.$folderpath.'" />';
          }
   
        $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" />
 <input type="hidden" name="cmd" />  <input type="hidden" name="cmd" />
 <input type="hidden" name="folderpath" />  $containertag
 </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="$folderpath" />  $uploadtag
 </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 1555  ENDCOURSEVERIFY Line 1678  ENDCOURSEVERIFY
        &changewarning($r,$postexec);         &changewarning($r,$postexec);
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.         my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';                       '.sequence';
          my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                        '.page';
   
        $r->print(<<ENDFORM);         $r->print(<<ENDFORM);
 <table cellspacing=4 cellpadding=4><tr>  <table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">$lt{'uplm'}</th>  <th bgcolor="#DDDDDD">$lt{'uplm'}</th>
Line 1568  $lt{'file'}:<br /> Line 1694  $lt{'file'}:<br />
 <br />  <br />
 $lt{'title'}:<br />  $lt{'title'}:<br />
 <input type="text" size="50" name="comment">  <input type="text" size="50" name="comment">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  $uploadtag
 <input type="hidden" name="cmd" value="upload_default">  <input type="hidden" name="cmd" value="upload_default">
 <nobr>  <nobr>
 <input type="submit" value="$lt{'upld'}">  <input type="submit" value="$lt{'upld'}">
Line 1578  $lt{'title'}:<br /> Line 1704  $lt{'title'}:<br />
 </td>  </td>
 <td bgcolor="#DDDDDD">  <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">  <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  $uploadtag
 <input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}">  <input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}">
 <nobr>  <nobr>
 <input type=button onClick="javascript:groupimport();" value="$lt{'impo'}">  <input type=button onClick="javascript:groupimport();" value="$lt{'impo'}">
Line 1593  value="$lt{'selm'}"> <input type="submit Line 1719  value="$lt{'selm'}"> <input type="submit
 $help{'Load_Map'}</nobr>  $help{'Load_Map'}</nobr>
 </p>  </p>
 </form>  </form>
 </td><td bgcolor="#DDDDDD">  </td>
   <td bgcolor="#DDDDDD">
   ENDFORM
          unless ($ENV{'form.pagepath'}) {
              $r->print(<<ENDFORM);
 <form action="/adm/coursedocs" method="post" name="newfolder">  <form action="/adm/coursedocs" method="post" name="newfolder">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
Line 1603  onClick="javascript:makenewfolder(this.f Line 1733  onClick="javascript:makenewfolder(this.f
 value="$lt{'newf'}" />$help{'Adding_Folders'}  value="$lt{'newf'}" />$help{'Adding_Folders'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newext">  <form action="/adm/coursedocs" method="post" name="newpage">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
   <input name="newpage" type="button"
   onClick="javascript:makenewpage(this.form,'$pageseq');"
   value="$lt{'newp'}" />$help{'Adding_Pages'}
   </nobr>
   </form>
   <form action="/adm/coursedocs" method="post" name="newext">
   $uploadtag
   <input type=hidden name="importdetail" value="">
   <nobr>
 <input name="newext" type="button" onClick="javascript:makenewext('newext');"  <input name="newext" type="button" onClick="javascript:makenewext('newext');"
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}  value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">  <form action="/adm/coursedocs" method="post" name="newsyl">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  $uploadtag
 <input type=hidden name="importdetail"   <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">  value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>  <nobr>
Line 1621  value="Syllabus=/public/$coursedom/$cour Line 1760  value="Syllabus=/public/$coursedom/$cour
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newnav">  <form action="/adm/coursedocs" method="post" name="newnav">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  $uploadtag
 <input type=hidden name="importdetail"   <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">  value="Navigate Content=/adm/navmaps">
 <nobr>  <nobr>
Line 1630  $help{'Navigate_Content'} Line 1769  $help{'Navigate_Content'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newsmppg">  <form action="/adm/coursedocs" method="post" name="newsmppg">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  $uploadtag
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newsmppg" type="button" value="$lt{'sipa'}"  <input name="newsmppg" type="button" value="$lt{'sipa'}"
Line 1638  onClick="javascript:makesmppage();" /> $ Line 1777  onClick="javascript:makesmppage();" /> $
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">  <form action="/adm/coursedocs" method="post" name="newsmpproblem">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  $uploadtag
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"  <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
Line 1646  onClick="javascript:makesmpproblem();" / Line 1785  onClick="javascript:makesmpproblem();" /
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newexamupload">  <form action="/adm/coursedocs" method="post" name="newexamupload">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  $uploadtag
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newexamupload" type="button" value="$lt{'scuf'}"  <input name="newexamupload" type="button" value="$lt{'scuf'}"
Line 1655  $help{'Score_Upload_Form'} Line 1794  $help{'Score_Upload_Form'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newbul">  <form action="/adm/coursedocs" method="post" name="newbul">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  $uploadtag
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newbulletin" type="button" value="$lt{'bull'}"  <input name="newbulletin" type="button" value="$lt{'bull'}"
Line 1664  $help{'Bulletin Board'} Line 1803  $help{'Bulletin Board'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">  <form action="/adm/coursedocs" method="post" name="newaboutme">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  $uploadtag
 <input type=hidden name="importdetail"   <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">  value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>  <nobr>
Line 1673  $help{'My Personal Info'} Line 1812  $help{'My Personal Info'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newaboutsomeone">  <form action="/adm/coursedocs" method="post" name="newaboutsomeone">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  $uploadtag
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newaboutsomeone" type="button" value="$lt{'abou'}"   <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
 onClick="javascript:makeabout();" />  onClick="javascript:makeabout();" />
 </nobr>  </nobr>
   ENDFORM
          }
          if ($ENV{'form.pagepath'}) {
              $r->print(<<ENDBLOCK);
   <form action="/adm/coursedocs" method="post" name="newsmpproblem">
   $uploadtag
   <input type=hidden name="importdetail" value="">
   <nobr>
   <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
   onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
   </nobr>
   </form>
   <form action="/adm/coursedocs" method="post" name="newexamupload">
   $uploadtag
   <input type=hidden name="importdetail" value="">
   <nobr>
   <input name="newexamupload" type="button" value="$lt{'scuf'}"
   onClick="javascript:makeexamupload();" />
   $help{'Score_Upload_Form'}
   </nobr>
   </form>
   ENDBLOCK
          } else {
              $r->print(<<ENDFORM);
 </form>  </form>
 <form action="/adm/imsimportdocs" method="post" name="ims">  <form action="/adm/imsimportdocs" method="post" name="ims">
 <input type="hidden" name="folder" value="$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>
 </td></tr>  
 </table>  
 ENDFORM  ENDFORM
          }
          $r->print('</td></tr>'."\n".
   '</table>');
        $r->print('</td></tr>');         $r->print('</td></tr>');
     }      }
 # ----------------------------------------------------- Supplemental documents  # ----------------------------------------------------- Supplemental documents
Line 1778  ENDSUPFORM Line 1942  ENDSUPFORM
     $r->print('</table>');      $r->print('</table>');
   } else {    } else {
 # -------------------------------------------------------- This is showdoc mode  # -------------------------------------------------------- This is showdoc mode
       $r->print("<h1>".&mt('Uploaded Document').'</h1><p>'.        $r->print("<h1>".&mt('Uploaded Document').' - '.
    &Apache::lonnet::gettitle($r->uri).'</h1><p>'.
 &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>".  &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>".
          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');           &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
   }    }
Removed from v.1.138  
changed lines
  Added in v.1.142

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