Diff for /loncom/imspackages/imsimportdocs.pm between versions 1.30 and 1.33

version 1.30, 2012/10/31 12:54:17 version 1.33, 2013/12/30 21:46:52
Line 48  sub jscript_one { Line 48  sub jscript_one {
                es => 'Enroll students only',                 es => 'Enroll students only',
                ea => 'Enroll all users',                 ea => 'Enroll all users',
                nr => 'Not required',                 nr => 'Not required',
                id => 'You must select one of the additional options when importing Disussion Boards',                 id => 'You must select one of the additional options when importing Discussion Boards.',
                ie => 'You must select one of the additional options when importing Enrollment',                 ie => 'You must select one of the additional options when importing Enrollment.',
                ct => 'You must check at least one Content Type',                  ct => 'You must check at least one Content Type.', 
     );      );
     return <<"ENDJS";      return <<"ENDJS";
 function setOptions(caller,itemnum) {  function setOptions(caller,itemnum) {
Line 225  sub display_one { Line 225  sub display_one {
   
     if ($unzip_result ne 'ok') {      if ($unzip_result ne 'ok') {
         $r->print(          $r->print(
             '<p class="LC_warning">'              &Apache::loncommon::confirmwrapper(
            .&mt('Processing of your IMS package failed because the file you'                  &Apache::lonhtmlcommon::confirm_success(
                .' uploaded could not be unzipped.')                      &mt('Processing of your IMS package failed because the file you'
            .'</p>'                         .' uploaded could not be unzipped.'),1)
              .'<br />'.&mt('Error: [_1]',$unzip_result))
         );          );
         return();          return();
     }      }
Line 239  sub display_one { Line 240  sub display_one {
                            \%resinfo,'choose',\%includedres,\%includeditems);                             \%resinfo,'choose',\%includedres,\%includeditems);
     if ($manifest_result ne 'ok') {      if ($manifest_result ne 'ok') {
         $r->print(          $r->print(
            '<p class="LC_warning">'              '<br />'.&Apache::loncommon::confirmwrapper(
           .&mt('Unpacking of your IMS package failed because an IMS manifest file was not located in the package.')                  &Apache::lonhtmlcommon::confirm_success(
           .'</p>'                      &mt('Unpacking of your IMS package failed because an IMS manifest file'
                          .' was not located in the package.'),1))
         );          );
         return();          return();
     }      }
Line 502  sub display_two { Line 504  sub display_two {
   
         &Apache::imsprocessor::process_resinfo($cms,'DOCS',$tempdir,$destdir,\%items,\%resources,\@targets,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\@groups,\%messages,\@timestamp,\%boardnum,\%resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,\%total,$seqstem,$seqstem,\@resrcfiles,\@packages,\%hrefs,\@pages,\@sequences);          &Apache::imsprocessor::process_resinfo($cms,'DOCS',$tempdir,$destdir,\%items,\%resources,\@targets,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\@groups,\%messages,\@timestamp,\%boardnum,\%resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,\%total,$seqstem,$seqstem,\@resrcfiles,\@packages,\%hrefs,\@pages,\@sequences);
   
         my $copy_result = &Apache::imsprocessor::copy_resources('DOCS',$cms,\%hrefs,$tempdir,\@targets,\%urls,$crs,$cdom,$destdir,$timenow,\%importareas);          my $copy_result = &Apache::imsprocessor::copy_resources('DOCS',$cms,\%hrefs,\%resources,$tempdir,\@targets,\%urls,$crs,$cdom,$destdir,$timenow,\%importareas);
   
         &Apache::imsprocessor::build_structure($cms,'DOCS',$destdir,\%items,\%resinfo,\%resources,\@targets,\%hrefs,$udom,$uname,'',$timenow,$cdom,$crs,\@timestamp,\%total,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\%boardnum,\@pages,\@sequences,\@topurls,\@topnames,\@packages,\%includeditems);          &Apache::imsprocessor::build_structure($cms,'DOCS',$destdir,\%items,\%resinfo,\%resources,\@targets,\%hrefs,$udom,$uname,'',$timenow,$cdom,$crs,\@timestamp,\%total,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\%boardnum,\@pages,\@sequences,\@topurls,\@topnames,\@packages,\%includeditems);
   
Line 558  sub display_two { Line 560  sub display_two {
     # Re-initialize Button      # Re-initialize Button
     my $initbutton =      my $initbutton =
            '<input type="button" value="'             '<input type="button" value="'
           .&mt('re-initializing course')            .&mt('re-initializing Course')
           .'" onclick="javascript:init(this.form)" />';            .'" onclick="javascript:init(this.form)" />';
     $r->print(      $r->print(
         '<form method="post" action="/adm/roles" target="loncapaclient" name="importDone">'          '<form method="post" action="/adm/roles" target="loncapaclient" name="importDone">'

Removed from v.1.30  
changed lines
  Added in v.1.33


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