--- loncom/imspackages/imsimport.pm	2013/07/02 19:04:42	1.40
+++ loncom/imspackages/imsimport.pm	2013/09/30 17:42:12	1.45
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 # 
-# $Id: imsimport.pm,v 1.40 2013/07/02 19:04:42 raeburn Exp $
+# $Id: imsimport.pm,v 1.45 2013/09/30 17:42:12 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -100,7 +100,7 @@ function createWin() {
   newWindow.document.write("<input type='hidden' name='action' value='newdir' />")
   newWindow.document.write("<input type='hidden' name='callingmode' value='imsimport' />")
   newWindow.document.write("$fullpath<input type='text' name='newfilename' value='' />")
-  newWindow.document.write("<input type='button' value='$lt{'go'}' onClick='document.fileaction.submit();' />")
+  newWindow.document.write("<input type='button' value='$lt{'go'}' onclick='document.fileaction.submit();' />")
   newWindow.document.write("</td></tr>\\n")
   newWindow.document.write("</table>")
   newWindow.document.write('$end_page')
@@ -133,6 +133,20 @@ sub jscript_two {
     $course_list = '"'.join('","',@crslist).'"';
     $$numcrs = @crslist;
 
+    my %lt = &Apache::lonlocal::texthash(
+                  sel    => 'Please select',
+                  impto  => 'Import topics only',
+                  imptpa => 'Import topics + posts (with author)',
+                  imptpn => 'Import topics + posts (no author)',
+                  enrst  => 'Enroll students only',
+                  enrall => 'Enroll all users',
+                  notreq => 'Not required',
+                  errao  => 'You must select one of the additional options when importing Discussion Boards.',
+                  errtd  => 'You must select a target course when importing Discussion Boards.',
+                  errap  => 'You must select one of the additional options when importing Enrollment.',
+                  errte  => 'You must select a target course when importing enrollment information.',
+                  errcc  => 'You must check at least one Content Type.',
+       );
     return <<"END_OF_TWO";
 
 function checkCourse() {
@@ -181,7 +195,7 @@ function setCourse(step2Form,call) {
     step2Form.targetcourse.length = 0
     if (call == 'add') {
         step2Form.targetcourse.length = 0
-        step2Form.targetcourse.options[0] = new Option("Please Select","0",true,true)
+        step2Form.targetcourse.options[0] = new Option("$lt{'sel'}","0",true,true)
         for (var i=0; i<courseID_array.length; i++) {
             step2Form.targetcourse.options[i+1] = new Option(courseTitle_array[i],courseID_array[i],false,false)
         }
@@ -201,22 +215,22 @@ function setOptions(caller,itemnum) {
   opForm.elements[menu].length = 0
   if (opForm.elements[itemnum*2].checked == true) {
     if (caller == "board") {
-      opForm.elements[menu].options[0] = new Option("Select","-1",true,true)
-      opForm.elements[menu].options[1] = new Option("Import topics only","topics",true,true)
-      opForm.elements[menu].options[2] = new Option("Import topics + posts (with author)","allpost",true,true)
-      opForm.elements[menu].options[3] = new Option("Import topics + posts (no author)","allanon",true,true)
+      opForm.elements[menu].options[0] = new Option("$lt{'sel'}","-1",true,true)
+      opForm.elements[menu].options[1] = new Option("$lt{'impto'}","topics",true,true)
+      opForm.elements[menu].options[2] = new Option("$lt{'imptpa'}","allpost",true,true)
+      opForm.elements[menu].options[3] = new Option("$lt{'imptpn'}","allanon",true,true)
     }
     else { 
       if (caller == "users") {
         opForm.elements[menu].length = 0
-        opForm.elements[menu].options[0] = new Option("Select","-1",true,true)
-        opForm.elements[menu].options[1] = new Option("Enroll students only","students",true,true)
-        opForm.elements[menu].options[2] = new Option("Enroll all users","all",true,true)
+        opForm.elements[menu].options[0] = new Option("$lt{'sel'}","-1",true,true)
+        opForm.elements[menu].options[1] = new Option("$lt{'enrst'}","students",true,true)
+        opForm.elements[menu].options[2] = new Option("$lt{'enrall'}","all",true,true)
       }
     }
   }
   else {
-    opForm.elements[menu].options[0] = new Option("Not required","0",true,true)
+    opForm.elements[menu].options[0] = new Option("$lt{'notreq'}","0",true,true)
   }
   opForm.elements[menu].selectedIndex = 0
   if (numCrs > 0) {
@@ -234,7 +248,7 @@ function verify(caller) {
       totcheck ++
       if (opForm.elements[2*i].name == "board") { 
         if (opForm.elements[2*i+1].selectedIndex == 0) {     
-          alert("You must select one of the additional options when importing Discussion Boards ")
+          alert("$lt{'errao'}")
           return false
         }
         if (numCrs == 0) {
@@ -243,14 +257,14 @@ function verify(caller) {
         }
         else {
           if (opForm.targetcourse.selectedIndex == 0) {
-            alert("You must select a target course when importing Discussion Boards")
+            alert("$lt{'errtd'}")
             return false
           }
         }
       }
       if (opForm.elements[2*i].name == "users") {
         if (opForm.elements[2*i+1].selectedIndex == 0) {     
-          alert("You must select one of the additional options when importing Enrollment")
+          alert("$lt{'errap'}")
           return false
         }
         if (numCrs == 0) {
@@ -259,7 +273,7 @@ function verify(caller) {
         }
         else {
           if (opForm.targetcourse.selectedIndex == 0) {
-            alert("You must select a target course when importing enrollment information")
+            alert("$lt{'errte'}")
             return false
           }
         }
@@ -267,7 +281,7 @@ function verify(caller) {
     }
   }
   if (totcheck == 0) {
-    alert("You must check the Checkbox for at least one Content Type");
+    alert("$lt{'errcc'}");
     return false
   }
   return true
@@ -286,11 +300,11 @@ END_OF_TWO
 # ---------------------------------------------------------------- Display One
 sub display_one {
     my ($r,$fn,$fullpath,$formname) = @_;
-    $r->print('<form name="'.$formname.'" method="post">'.
+    $r->print('<form name="'.$formname.'" method="post" action="">'.
               &Apache::lonhtmlcommon::topic_bar(1,&mt('Specify the Course Management system used to create the package')).
         &mt('Choose the CMS used to create your IMS content package.').'&nbsp;&nbsp;
         <select name="source">
-         <option value="-1" selected="selected">Please select</option>
+         <option value="-1" selected="selected">'.&mt('Please select').'</option>
          <option value="bb5">Blackboard 5</option>
          <option value="bb6">Blackboard 6</option>
          <option value="angel5">ANGEL 5.5</option>
@@ -298,11 +312,11 @@ sub display_one {
          <option value="webctvista4">WebCT Vista 4</option>
         </select><br />'."\n".
         &Apache::lonhtmlcommon::topic_bar(2,&mt('Create a directory where you will unpack your IMS package'))."\n".
-         &mt('Create a destination LON-CAPA directory in which to store the contents of the IMS package file.').'&nbsp;&nbsp;<input type="button" name="createdir" value="Create Directory" onClick="javascript:createWin()" /><input type="hidden" name="newdir" value="" /><br /><br />
+         &mt('Create a destination LON-CAPA directory in which to store the contents of the IMS package file.').'&nbsp;&nbsp;<input type="button" name="createdir" value="'.&mt('Create Directory').'" onclick="javascript:createWin()" /><input type="hidden" name="newdir" value="" /><br /><br />
           <input type="hidden" name="filename" value="'.$fn.'" />
           <input type="hidden" name="phase" value="three" />
-          <input type="button" name="nextpage" value="'.&mt('Proceed').'" onClick="javascript:nextPage();" />&nbsp;&nbsp;&nbsp;&nbsp;
-          <input type="button" name="exitpage" value="'.&mt('Exit now').'" onClick="javascript:location.href='."'$fullpath'".'" />
+          <input type="button" name="nextpage" value="'.&mt('Proceed').'" onclick="javascript:nextPage();" />&nbsp;&nbsp;&nbsp;&nbsp;
+          <input type="button" name="exitpage" value="'.&mt('Exit now').'" onclick="javascript:location.href='."'$fullpath'".'" />
          </form>');
 }
 
@@ -332,12 +346,12 @@ sub display_two {
                   type => 'Content type',
                   addo => 'Additional options',
                   chec => 'Check Import first',
-                  bbus => 'Choose a course to receive bulletin boards and user enrollment',
-                  list => 'A listing of possible course targets will be displayed if import of bulletin boards and/or enrollment is checked above (step 3). If you do not plan to import either of these content types, there is no need to specify a course.',
+                  bbus => 'Choose a course to receive discussion boards and user enrollment',
+                  list => 'A listing of possible course targets will be displayed if import of discussion boards and/or enrollment is checked above (step 3). If you do not plan to import either of these content types, there is no need to specify a course.',
                   chco => 'Choose course:',
                   nreq => 'Not required',
-                  yodo => 'You do not have active course coordinator status in any LON-CAPA courses currently, so bulletin boards and enrollment information included in your IMS package will be discarded, regardless of your import choice for these two items above (step 3).',
-                  ifyo => "If you wish to import bulletin boards and/or user information into LON-CAPA please click 'Exit now' to quit the current IMS import process, and contact your domain coordinator and request a course coordinator role in a LON-CAPA course into which you can upload bulletin boards and/or enroll users.",
+                  yodo => 'You do not have active course coordinator status in any LON-CAPA courses currently, so discussion boards and enrollment information included in your IMS package will be discarded, regardless of your import choice for these two items above (step 3).',
+                  ifyo => "If you wish to import discussion boards and/or user information into LON-CAPA please click 'Exit now' to quit the current IMS import process, and contact your domain coordinator and request a course coordinator role in a LON-CAPA course into which you can upload discussion boards and/or enroll users.",
                   impa => 'Import package',
                   unpa => 'Unpacking of your IMS package failed because an IMS manifest file was not located in the package',
                   proc => 'Processing of your IMS package failed because the file you uploaded could not be unzipped',
@@ -396,7 +410,7 @@ sub display_two {
                 $conditions = 'none';
             }
 
-            $r->print('<form name="pickoptions" method="post">'.
+            $r->print('<form name="pickoptions" method="post" action="">'.
                       &Apache::lonhtmlcommon::topic_bar(3,$lt{'cont'}).
                       &Apache::loncommon::start_data_table().
                       &Apache::loncommon::start_data_table_header_row().
@@ -409,7 +423,7 @@ sub display_two {
                     $r->print(&Apache::loncommon::start_data_table_row()."\n".
                               '<td><input name="'.$area.'" type="checkbox" ');
                     if ($area eq 'board' || $area eq 'users') {
-                        $r->print('onClick="javascript:setOptions('."'$area','$counter'".');" ');
+                        $r->print('onclick="javascript:setOptions('."'$area','$counter'".');" ');
                     }
                     $r->print('/></td>'.
                               '<td>&nbsp;&nbsp;'.$$areaname{$area}.'&nbsp;&nbsp; - '.
@@ -459,13 +473,17 @@ sub display_two {
             if ($count{users} == 0) {
                 $r->print('<input type="hidden" name="users" value="" />'."\n");
             }
-            $r->print('<input type="button" name="nextpage" value="'.$lt{'impa'}.'" onClick="javascript:nextPage('."'$counter.'".')" />&nbsp;&nbsp;&nbsp;
-           <input type="button" name="exitpage" value="'.$lt{'exit'}.'" onClick="javascript:location.href='."'$fullpath'".'" /></form>');
+            $r->print('<input type="button" name="nextpage" value="'.$lt{'impa'}.'" onclick="javascript:nextPage('."'$counter.'".')" />&nbsp;&nbsp;&nbsp;
+           <input type="button" name="exitpage" value="'.$lt{'exit'}.'" onclick="javascript:location.href='."'$fullpath'".'" /></form>');
         } else {
             $r->print($lt{'unpa'});
         }
     } else {
-        $r->print($lt{'proc'});
+        $r->print(
+            '<br />'.&Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success($lt{'proc'},1)
+               .'<br />'.&mt('Error: [_1]',$unzip_result))
+        );
     }
 }
 
@@ -543,7 +561,9 @@ sub display_three {
     my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,
                           \%resources,\%items,\%hrefs,\%resinfo,'prepare',
                           \%includedres);
+
     if ($manifest_result eq 'ok') {
+        my %possibledep;
         foreach my $res (sort keys %resources) {
             if ($importareas{$resources{$res}{type}}) {
                 $includedres{$res} = 1;
@@ -552,6 +572,13 @@ sub display_three {
                      $resources{$res}{type} eq 'webct.question') {
                     push(@assessmentfiles,$res);
                 }   
+            } elsif ($resources{$res}{usedby}) {
+                $possibledep{$res} = 1;
+            }
+        }
+        foreach my $res (sort(keys(%possibledep))) {
+            if ($includedres{$resources{$res}{usedby}}) {
+                $includedres{$res} = 1;
             }
         }
         foreach my $itm (sort keys %items) {
@@ -566,6 +593,7 @@ sub display_three {
     $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,
                        \%resources,\%items,\%hrefs,\%resinfo,'build',
                        \%includedres,\%includeditems);
+
     if ($manifest_result eq 'ok') {
         &Apache::imsprocessor::target_resources(\%resources,\%importareas,\@targets);
 
@@ -584,24 +612,36 @@ sub display_three {
 
         &Apache::imsprocessor::process_resinfo($cms,'CSTR',$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,\%randompicks);
 
-        my $copy_result = &Apache::imsprocessor::copy_resources('CSTR',$cms,\%hrefs,$tempdir,\@targets,\%urls,$crs,$cdom,$destdir,$timenow,\@assessmentfiles,\%total);
+        my $copy_result = &Apache::imsprocessor::copy_resources('CSTR',$cms,\%hrefs,\%resources,$tempdir,\@targets,\%urls,$crs,$cdom,$destdir,$timenow,\@assessmentfiles,\%total);
    
         &Apache::imsprocessor::build_structure($cms,'CSTR',$destdir,\%items,\%resinfo,\%resources,\@targets,\%hrefs,$udom,$uname,$dirpath,$timenow,$cdom,$crs,\@timestamp,\%total,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\%boardnum,\@pages,\@sequences,\@topurls,\@topnames,\@packages,\%includeditems,\%randompicks);
 
-        $r->print("<h3>IMS import completed</h3>");
+        my $message =
+            &Apache::lonhtmlcommon::confirm_success(
+                &mt('IMS import completed'))
+           .'<br />'.$lt{'yims'}.' ';
 
         if ($cms eq 'angel5') {
-            $r->print($lt{'yims'}.' '.&mt('A total of [quant,_1,sequence], [quant,_2,composite page], and [quant,_3,bulletin board] have been created, and [quant,_4,file] copied.',$total{seq},$total{page},$total{board},$total{file})."\n");
+            $message .= &mt('A total of [quant,_1,sequence], [quant,_2,composite page], and [quant,_3,discussion board] have been created, and [quant,_4,file] copied.',$total{seq},$total{page},$total{board},$total{file})."\n";
         } else {
-            $r->print($lt{'yims'}.' '.&mt('A total of [quant,_1,sequence], [quant,_2,composite page], [quant,_3,bulletin board], [quant,_4,quiz,quizzes], [quant,_5,survey], and [quant,_6,problem] have been created, and [quant,_7,file] copied.',$total{seq},$total{page},$total{board},$total{quiz},$total{surv},$total{prob},$total{file})."\n");
+            $message .= &mt('A total of [quant,_1,sequence], [quant,_2,composite page], [quant,_3,discussion board], [quant,_4,quiz,quizzes], [quant,_5,survey], and [quant,_6,problem] have been created, and [quant,_7,file] copied.',$total{seq},$total{page},$total{board},$total{quiz},$total{surv},$total{prob},$total{file})."\n";
         }
-        $r->print('<br /><br />'.$lt{'plsv'}.' '.$lt{'tseq'}.'<br /><br />'.$lt{'tfin'}.'<br /><br /><a href="/priv/'.$udom.'/'.$uname.'/'.$dirpath.'/">'.$lt{'disp'}.'</a>');
+        $r->print(
+            '<br />'.&Apache::loncommon::confirmwrapper($message)
+           .'<p>'.$lt{'plsv'}.' '.$lt{'tseq'}.'</p>'
+           .'<p>'.$lt{'tfin'}.'</p>'
+           .&Apache::lonhtmlcommon::actionbox(
+                ['<a href="/priv/'.$udom.'/'.$uname.'/'.$dirpath.'/">'.$lt{'disp'}.'</a>'])
+        );
         my $londocroot = $r->dir_config('lonDocRoot');
         if ($destdir =~ m{^\Q$londocroot/priv/$udom/$uname/$dirpath\E}) {
             system (" rm -r -f $destdir/temp");
         }
     } elsif ($manifest_result eq 'nomanifest') {
-        $r->print($lt{'proc'});
+        $r->print(
+            '<br />'.&Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success($lt{'proc'},1))
+        );
     }
 }
 
@@ -739,6 +779,12 @@ END_JS
         my $flag = &Apache::lonupload::phasetwo($r,$fn,'imsimport');
         if ($flag eq 'ok') {
             &display_one($r,$fn,$fullpath,$formname_one);
+        } else {
+            $r->print(
+                '<br />'.&Apache::loncommon::confirmwrapper(
+                    &Apache::lonhtmlcommon::confirm_success(
+                        &mt('Error uploading IMS package'),1))
+            );
         }
     } elsif ( ($env{'form.phase'} eq 'three') || ($env{'form.phase'} eq 'four') ) {
         my $destdir = $env{'form.newdir'};