Diff for /loncom/interface/londocs.pm between versions 1.69.2.1.2.1 and 1.73

version 1.69.2.1.2.1, 2003/08/07 19:12:13 version 1.73, 2003/09/05 18:11:26
Line 72  sub storemap { Line 72  sub storemap {
                                 $map,1);                                  $map,1);
 }  }
   
   # Imports the given (name, url) resources into the course
   # coursenum, coursedom, and folder must precede the list
   sub group_import {
       my $coursenum = shift;
       my $coursedom = shift;
       my $folder = shift;
       while (@_) {
    my $name = shift;
    my $url = shift;
    if ($url) {
       my $idx = $#Apache::lonratedt::resources + 1;
       $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;
       my $ext = 'false';
       if ($url=~/^http:\/\//) { $ext = 'true'; }
       $url =~ s/:/\:/g;
       $name =~ s/:/\:/g;
       $Apache::lonratedt::resources[$idx] = 
    join ':', ($name, $url, $ext, 'normal', 'res');
    }
       }
       &storemap($coursenum, $coursedom, $folder);
   }
   
 sub editor {  sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;      my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
     if ($ENV{'form.foldername'}) {      if ($ENV{'form.foldername'}) {
Line 158  sub editor { Line 181  sub editor {
             }              }
 # Group import/search  # Group import/search
     if ($ENV{'form.importdetail'}) {      if ($ENV{'form.importdetail'}) {
                foreach (split(/\&/,$ENV{'form.importdetail'})) {   my @imports;
                   if (defined($_)) {   foreach (split(/\&/,$ENV{'form.importdetail'})) {
              my ($name,$url)=split(/\=/,$_);      if (defined($_)) {
                      $name=&Apache::lonnet::unescape($name);   my ($name,$url)=split(/\=/,$_);
                      $url=&Apache::lonnet::unescape($url);   $name=&Apache::lonnet::unescape($name);
                      if ($url) {   $url=&Apache::lonnet::unescape($url);
                 my $idx=$#Apache::lonratedt::resources+1;   push @imports, $name, $url;
                         $Apache::lonratedt::order      }
                            [$#Apache::lonratedt::order+1]=$idx;   }
                         my $ext='false';  
                         if ($url=~/^http\:\/\//) { $ext='true'; }  
                         $url=~s/\:/\:/g;  
                         $name=~s/\:/\:/g;  
                         $Apache::lonratedt::resources[$idx]=  
                            $name.':'.$url.':'.$ext.':normal:res';  
              }  
                  }  
       }  
 # Store the changed version  # Store the changed version
  &storemap($coursenum,$coursedom,$folder.'.sequence');   group_import($coursenum, $coursedom, $folder, @imports);
             }              }
 # Loading a complete map  # Loading a complete map
    if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {     if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
Line 265  END Line 279  END
        }          } 
     }      }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;      $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
     if ($residx) {      if (($residx) && ($folder!~/supplemental/)) {
        $url.=(($url=~/\?/)?'&':'?').'symb='.         $url.=(($url=~/\?/)?'&':'?').'symb='.
        &Apache::lonnet::escape(&Apache::lonnet::symbclean(         &Apache::lonnet::escape(&Apache::lonnet::symbclean(
           &Apache::lonnet::declutter('uploaded/'.            &Apache::lonnet::declutter('uploaded/'.
Line 513  ENDHEADERS Line 527  ENDHEADERS
     my $script='';      my $script='';
     my $allowed;      my $allowed;
     my $events='';      my $events='';
     my $buttons='';  
     my $showdoc=0;      my $showdoc=0;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        ['folder','foldername']);         ['folder','foldername']);
Line 535  ENDHEADERS Line 548  ENDHEADERS
        $script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>';         $script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>';
        $events='onLoad="'.&Apache::lonmenu::loadevents.         $events='onLoad="'.&Apache::lonmenu::loadevents.
            '" onUnload="'.&Apache::lonmenu::unloadevents.'"';             '" onUnload="'.&Apache::lonmenu::unloadevents.'"';
        $buttons=&Apache::lonmenu::menubuttons(1,undef);  
     }      }
   
 # get course data  # get course data
Line 648  ENDNEWSCRIPT Line 660  ENDNEWSCRIPT
   }    }
 # -------------------------------------------------------------------- Body tag  # -------------------------------------------------------------------- Body tag
   $r->print('</head>'.    $r->print('</head>'.
             &Apache::loncommon::bodytag('Course Documents','',$events).              &Apache::loncommon::bodytag('Course Documents','',$events,
             $buttons);   '','',$showdoc));
   unless ($showdoc) {    unless ($showdoc) {
     if ($allowed) {      if ($allowed) {
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',         $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
Line 787  $help{'Navigate_Content'} Line 799  $help{'Navigate_Content'}
 onClick="javascript:makesmppage();" /> $help{'Simple Page'}  onClick="javascript:makesmppage();" /> $help{'Simple Page'}
 </nobr>  </nobr>
 </form>  </form>
   <form action="/adm/coursedocs" method="post" name="newsmpproblem">
   <input type="hidden" name="folder" value="$folder">
   <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
   <input type=hidden name="importdetail" value="">
   <nobr>
   <input name="newsmpproblem" type="button" value="Simple Problem"
   onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
   </nobr>
   </form>
 <form action="/adm/coursedocs" method="post" name="newexamupload">  <form action="/adm/coursedocs" method="post" name="newexamupload">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">

Removed from v.1.69.2.1.2.1  
changed lines
  Added in v.1.73


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