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

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

version 1.59, 2003/06/08 01:46:41 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 329  sub checkonthis { Line 343  sub checkonthis {
                      $r->print(' ');                       $r->print(' ');
                  }                   }
                  $r->print('- Rendering: ');                   $r->print('- Rendering: ');
                    my $oldpath=$ENV{'request.filename'};
                    $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url);
                  &Apache::lonxml::xmlparse($r,'web',                   &Apache::lonxml::xmlparse($r,'web',
                    &Apache::lonnet::getfile(                     &Apache::lonnet::getfile(
                     &Apache::lonnet::filelocation('',$url)));                      &Apache::lonnet::filelocation('',$url)));
    $ENV{'request.filename'}=$oldpath;
                  if (($Apache::lonxml::errorcount) ||                   if (($Apache::lonxml::errorcount) ||
                      ($Apache::lonxml::warningcount)) {                       ($Apache::lonxml::warningcount)) {
      if ($Apache::lonxml::errorcount) {       if ($Apache::lonxml::errorcount) {
Line 375  sub handler { Line 392  sub handler {
 # --------------------------------------------- Initialize help topics for this  # --------------------------------------------- Initialize help topics for this
   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',             'Adding_Folders','Docs_Overview', 'Load_Map',
            'Creating_From_Template','Supplemental',             'Supplemental', 'Score_Upload_Form',
            'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {             'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {
       $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);        $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
   }    }
       # Composite help files
       $help{'Syllabus'} = &Apache::loncommon::help_open_topic(
       'Docs_About_Syllabus,Docs_Editing_Templated_Pages');
       $help{'Simple Page'} = &Apache::loncommon::help_open_topic(
       'Docs_About_Simple_Page,Docs_Editing_Templated_Pages');
       $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(
       'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
       $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
     'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
       $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
    
   if ($ENV{'form.verify'}) {    if ($ENV{'form.verify'}) {
     
    my $loaderror=&Apache::lonnet::overloaderror($r);     my $loaderror=&Apache::lonnet::overloaderror($r);
Line 398  sub handler { Line 425  sub handler {
        }         }
    }     }
    &untiehash();     &untiehash();
      $r->print('<h1>Done.</h1>');
   } elsif ($ENV{'form.versions'}) {    } elsif ($ENV{'form.versions'}) {
     $r->print('<html><head><title>Check Versions</title></head>'.      $r->print('<html><head><title>Check Versions</title></head>'.
               &Apache::loncommon::bodytag('Check Course Document Versions'));                &Apache::loncommon::bodytag('Check Course Document Versions'));
Line 485  ENDHEADERS Line 513  ENDHEADERS
           }            }
        }         }
        $r->print('</table>');         $r->print('</table>');
          $r->print('<h1>Done.</h1>');
    } else {     } else {
        $r->print('<p>No content modifications yet.</p>');         $r->print('<p>No content modifications yet.</p>');
    }     }
Line 498  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 520  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 539  ENDHEADERS Line 566  ENDHEADERS
     $iconpath = $r->dir_config('lonIconsURL') . "/";      $iconpath = $r->dir_config('lonIconsURL') . "/";
   
     my $now=time;      my $now=time;
 #  
 # FIXME: hack to disable new problem  
 #  
     my $noeggforyou='';  
     unless ($ENV{'user.debug'}) {  
  $noeggforyou='alert("Sorry, not implemented yet."); return 0;';  
     }  
 # print screen  # print screen
     $r->print(<<ENDDOCUMENT);      $r->print(<<ENDDOCUMENT);
 <html>  <html>
Line 571  function makenewext(targetname) { Line 592  function makenewext(targetname) {
     window.open('/adm/rat/extpickframe.html');      window.open('/adm/rat/extpickframe.html');
 }  }
   
   function makeexamupload() {
      var title=prompt('Listed Title for the Uploaded Score');
      if (title) { 
       this.document.forms.newexamupload.importdetail.value=
    title+'=/res/lib/templates/examupload.problem';
       this.document.forms.newexamupload.submit();
      }
   }
   
 function makesmppage() {  function makesmppage() {
    var title=prompt('Listed Title for the Page');     var title=prompt('Listed Title for the Page');
    if (title) {      if (title) { 
Line 581  function makesmppage() { Line 611  function makesmppage() {
 }  }
   
 function makesmpproblem() {  function makesmpproblem() {
    $noeggforyou  
    var title=prompt('Listed Title for the Problem');     var title=prompt('Listed Title for the Problem');
    if (title) {      if (title) { 
     this.document.forms.newsmpproblem.importdetail.value=      this.document.forms.newsmpproblem.importdetail.value=
  title+'=/adm/wrapper/uploaded/$udom/$uname/$now.problem';   title+'=/res/lib/templates/simpleproblem.problem';
     this.document.forms.newsmpproblem.submit();      this.document.forms.newsmpproblem.submit();
    }     }
 }  }
Line 631  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 673  ENDCOURSEVERIFY Line 702  ENDCOURSEVERIFY
 '<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">Changes will become active for your current session after <input type="hidden" name="'.  '<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">Changes will become active for your current session after <input type="hidden" name="'.
 $ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.</font></h3></form>');  $ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.'.
   $help{'Caching'}.'</font></h3></form>');
        }         }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.         my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';                       '.sequence';
Line 696  Title:<br /> Line 726  Title:<br />
 <input type="hidden" name="cmd" value="upload_default">  <input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="Upload Document">  <input type="submit" value="Upload Document">
 <nobr>  <nobr>
  $help{'Uploading_From_Harddrive'}</form>   $help{'Uploading_From_Harddrive'}
 </nobr>  </nobr>
   </form>
 </td>  </td>
 <td bgcolor="#DDDDDD">  <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">  <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
Line 712  $help{'Importing_LON-CAPA_Resource'} Line 743  $help{'Importing_LON-CAPA_Resource'}
 </nobr>  </nobr>
 <p>  <p>
 <hr />  <hr />
 <input type="text" size="20" name="importmap">  <input type="text" size="20" name="importmap"><br />
 <input type=button   <nobr><input type=button 
 onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"  onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
 value="Browse for Map"><input type="submit" name="loadmap" value="Load Map">  value="Select Map"> <input type="submit" name="loadmap" value="Load Map">
   $help{'Load_Map'}</nobr>
 </p>  </p>
 </form>  </form>
 </td><td bgcolor="#DDDDDD">  </td><td bgcolor="#DDDDDD">
Line 745  value="External Resource" /> $help{'Addi Line 777  value="External Resource" /> $help{'Addi
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">  value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>  <nobr>
 <input name="newsyl" type="submit" value="Syllabus" />   <input name="newsyl" type="submit" value="Syllabus" /> 
  $help{'Creating_From_Template'}   $help{'Syllabus'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newnav">  <form action="/adm/coursedocs" method="post" name="newnav">
Line 764  $help{'Navigate_Content'} Line 796  $help{'Navigate_Content'}
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newsmppg" type="button" value="Simple Page"  <input name="newsmppg" type="button" value="Simple Page"
 onClick="javascript:makesmppage();" /> $help{'Creating_From_Template'}  onClick="javascript:makesmppage();" /> $help{'Simple Page'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">  <form action="/adm/coursedocs" method="post" name="newsmpproblem">
Line 773  onClick="javascript:makesmppage();" /> $ Line 805  onClick="javascript:makesmppage();" /> $
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newsmpproblem" type="button" value="Simple Problem"  <input name="newsmpproblem" type="button" value="Simple Problem"
 onClick="javascript:makesmpproblem();" />$help{'Creating_From_Template'}  onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
   </nobr>
   </form>
   <form action="/adm/coursedocs" method="post" name="newexamupload">
   <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="newexamupload" type="button" value="Score Upload Form"
   onClick="javascript:makeexamupload();" />
   $help{'Score_Upload_Form'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newbul">  <form action="/adm/coursedocs" method="post" name="newbul">
Line 783  onClick="javascript:makesmpproblem();" / Line 825  onClick="javascript:makesmpproblem();" /
 <nobr>  <nobr>
 <input name="newbulletin" type="button" value="Bulletin Board"  <input name="newbulletin" type="button" value="Bulletin Board"
 onClick="javascript:makebulboard();" />  onClick="javascript:makebulboard();" />
 $help{'Creating_From_Template'}  $help{'Bulletin Board'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">  <form action="/adm/coursedocs" method="post" name="newaboutme">
Line 793  $help{'Creating_From_Template'} Line 835  $help{'Creating_From_Template'}
 value="$plainname=/adm/$udom/$uname/aboutme">  value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>  <nobr>
 <input name="newaboutme" type="submit" value="My Personal Info" />  <input name="newaboutme" type="submit" value="My Personal Info" />
 $help{'Creating_From_Template'}  $help{'My Personal Info'}
 </nobr>  </nobr>
 </form>  </form>
 </td></tr>  </td></tr>
Line 849  ENDFORM Line 891  ENDFORM
 <input type="text" size="20" name="importmap">  <input type="text" size="20" name="importmap">
 <input type=button   <input type=button 
 onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"  onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"
 value="Browse for Map"><input type="submit" name="loadmap" value="Load Map">  value="Select Map"><input type="submit" name="loadmap" value="Load Map">
 </p>  </p>
 </form>  </form>
 </td><td bgcolor="#DDDDDD">  </td><td bgcolor="#DDDDDD">
Line 880  value="External Resource" /> $help{'Addi Line 922  value="External Resource" /> $help{'Addi
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">  value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>  <nobr>
 <input name="newsyl" type="submit" value="Syllabus" />  <input name="newsyl" type="submit" value="Syllabus" />
 $help{'Creating_From_Template'}  $help{'Syllabus'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="subnewaboutme">  <form action="/adm/coursedocs" method="post" name="subnewaboutme">
Line 890  $help{'Creating_From_Template'} Line 932  $help{'Creating_From_Template'}
 value="$plainname=/adm/$udom/$uname/aboutme">  value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>  <nobr>
 <input name="newaboutme" type="submit" value="My Personal Info" />  <input name="newaboutme" type="submit" value="My Personal Info" />
 $help{'Creating_From_Template'}  $help{'My Personal Info'}
 </nobr>  </nobr>
 </form>  </form>
 </td></tr>  </td></tr>
Removed from v.1.59  
changed lines
  Added in v.1.73

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