--- loncom/imspackages/imsimportdocs.pm	2006/05/30 12:45:50	1.18
+++ loncom/imspackages/imsimportdocs.pm	2009/11/06 17:16:53	1.24
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: imsimportdocs.pm,v 1.18 2006/05/30 12:45:50 www Exp $
+# $Id: imsimportdocs.pm,v 1.24 2009/11/06 17:16:53 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,7 @@ use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::imsprocessor;
 use LONCAPA::Configuration;
+use LONCAPA::map();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
@@ -206,96 +207,38 @@ sub display_one {
     my ($r) = @_;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder']);
 
-    $r->print(<<ENDBLOCK);
-<form action="/adm/imsimportdocs" method="post" enctype="multipart/form-data" name="pickcms">
-  <table border='0' bgcolor='#F6F6F6' cellspacing='0' cellpadding ='0' width='100%'>
-   <tr>
-    <td colspan='2'>
-     <table border='0' cellspacing='0' cellpadding='0'>
-      <tr>
-        <td colspan='2'  align='left'>&nbsp;
-        </td>
-       </tr>
-       <tr bgcolor='#CCCCFF'>
-        <td valign='middle'><img src='/res/adm/pages/bl_step1.gif'>&nbsp;
-        </td>
-        <td width='100%' align='left'>&nbsp;&nbsp;
-         <font face='arial,helvetica,sans-serif'><b>Specify the Course Management system used to create the package.</b>&nbsp;&nbsp;
-         </font>
-       </td>
-      </tr>
-      <tr>
-       <td colspan='2'>&nbsp;</td>
-      </tr>
-      <tr>
-       <td>&nbsp;</td>
-       <td>
-        <font face='Arial,Helvetica,sans-serif'>
-Please choose the CMS used to create your IMS content package.&nbsp;&nbsp;
-        <select name="source">
-         <option value='-1' selected="true">Please select</option>
-         <option value='bb5'>Blackboard 5</option>
-         <option value='bb6'>Blackboard 6</option>
-         <option value='angel'>ANGEL</option>
-         <option value='webctce4'>WebCT 4 Campus Edition</option>
-        </select>
-        </font>
-       </td>
-      </tr>
-      <tr>
-       <td colspan='2'>&nbsp;</td>
-      </tr>
-      <tr>
-       <td colspan='2'>&nbsp;</td>
-      </tr>
-      <tr bgcolor='#CCCCFF'>
-        <td valign='middle'><img src='/res/adm/pages/bl_step2.gif'>&nbsp;
-        </td>
-        <td width='100%' align='left'>&nbsp;&nbsp;
-         <font face='arial,helvetica,sans-serif'><b>Locate the IMS content package you wish to upload.</b>&nbsp;&nbsp;
-         </font>
-       </td>
-      </tr>
-      <tr>
-       <td colspan='2'>&nbsp;</td>
-      </tr>
-      <tr>
-       <td colspan='2'>&nbsp;
-        <input type="hidden" name="folder" value="$env{'form.folder'}" />
-        <input type="hidden" name="phase" value="two" />
-        <input type="file" name="uploadname" size="40" />
-       </td>
-      </tr>
-      <tr>
-       <td colspan='2'>&nbsp;</td>
-      </tr>
-      <tr>
-       <td>&nbsp;</td>
-       <td><font face='arial,helvetica,sans-serif'>If you have selected the CMS, and located the IMS package, you should click the 'Upload IMS package' button to upload the file to the server.</font></td>
-      </tr>
-      <tr>
-       <td colspan='2'>&nbsp;</td>
-      </tr>
-      <tr
-       <td colspan='2'>
-        <table border='0' cellspacing='0' cellpadding='0' width="100%">
-         <tr>
-          <td align='left'>
-           <input type="button" name="exitpage" value="Exit now" onClick="javascript:self.close()" />
-          </td>
-          <td align='right'>
-           <input type="button" name="nextpage" value="Upload IMS package" onClick="javascript:nextPage()" />
-          </td>
-         </tr>
-        </table>
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
-</form>
-ENDBLOCK
+    $r->print(
+        '<form action="/adm/imsimportdocs" method="post"'
+       .' enctype="multipart/form-data" name="pickcms">'
+       .&Apache::lonhtmlcommon::topic_bar(
+            1,&mt('Specify the Course Management system used to create the package'))
+       .&mt('Please choose the CMS used to create your IMS content package:').' '
+       .'<select name="source">'
+       .'<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>'
+       .'<option value="webctce4">WebCT 4 Campus Edition</option>'
+       .'</select>'
+    );
+    $r->print(
+       &Apache::lonhtmlcommon::topic_bar(
+           2,&mt('Locate the IMS content package you wish to upload'))
+      .'<input type="hidden" name="folder" value="'.$env{'form.folder'}.'" />'
+      .'<input type="hidden" name="phase" value="two" />'
+      .&mt('File:')
+      .' <input type="file" name="uploadname" size="40" />'
+    );
+    $r->print(
+       '<hr />'
+      .'<p>'
+      .'<input type="button" name="exitpage" value="'.&mt('Cancel').'"'
+      .' onclick="javascript:self.close()" />'
+      .' '
+      .'<input type="button" name="nextpage" value="'.&mt('Upload IMS package').'"'
+      .' onclick="javascript:nextPage()" />'
+      .'</p>'
+    );
 }
 
 
@@ -345,7 +288,7 @@ sub display_two {
                             $count{$area} ++;
                         }
                     }
-                } elsif ($cms eq 'angel') {
+                } elsif ($cms eq 'angel5') {
                     foreach my $area (keys %{$cmsmap{$cms}}) {
                         if ($area eq 'doc') {
                             if (grep/^$resources{$res}{type}$/,@{$cmsmap{$cms}{doc}}) {
@@ -368,7 +311,7 @@ sub display_two {
        </td>
       </tr>
       <tr bgcolor='#CCCCFF'>
-       <td valign='middle'><img src='/res/adm/pages/bl_step3.gif'>
+       <td valign="middle"><img src="/res/adm/pages/bl_step3.gif" alt="3" />
        </td>
        <td width='100%' align='left'>&nbsp;&nbsp;
         <font face='arial,helvetica,sans-serif'><b>Choose which content types you wish to import</b></font>
@@ -438,10 +381,10 @@ ENDBLOCK
        <td colspan='2'>&nbsp;<br /><br /></td>
       </tr>
       <tr bgcolor='#CCCCFF'>
-       <td valign='middle'><img src='/res/adm/pages/bl_step4.gif'>
+       <td valign="middle"><img src="/res/adm/pages/bl_step4.gif" alt="4" />
        </td>
        <td width='100%' align='left'>&nbsp;&nbsp;
-        <font face='arial,helvetica,sans-serif'><b>Choose display options for listing of contents of top level of package.</b></font>
+        <font face='arial,helvetica,sans-serif'><b>Choose display options for listing of contents of top level of package</b></font>
        </td>
       </tr>
       <tr>
@@ -480,7 +423,7 @@ ENDBLOCK
         <table border='0' cellspacing='0' cellpadding='0' width="100%">
          <tr>
           <td align='left'>
-           <input type='button' name='exitpage' value='Exit now' onClick="javascript:self.close()" />
+           <input type='button' name='exitpage' value='Cancel' onClick="javascript:self.close()" />
           </td>
           <td align='right'>
            <input type="button" name="nextpage" value="Complete Import" onClick="javascript:nextPage($counter)" />
@@ -495,10 +438,19 @@ ENDBLOCK
   </table>
 ENDDOCUMENT
         } else {
-            $r->print("Unpacking of your IMS package failed because an IMS manifest file was not located in the package\n");
+            $r->print(
+               '<p class="LC_warning">'
+               .&mt('Unpacking of your IMS package failed because an IMS manifest file was not located in the package.')
+               .'</p>'
+            );
         }
     } else {
-        $r->print("Processing of your IMS package failed because the file you uploaded could not be unzipped\n");
+        $r->print(
+            '<p class="LC_warning">'
+           .&mt('Processing of your IMS package failed because the file you'
+               .' uploaded could not be unzipped.')
+           .'</p>'
+        );
     }
 }
 
@@ -552,7 +504,7 @@ sub display_three {
 
     foreach my $area (@{$areas}) {
         if (defined($env{"form.$area"}) && ($env{'form.'.$area} ne '')) {
-            if ($cms eq 'angel' && $area eq 'doc') {
+            if ($cms eq 'angel5' && $area eq 'doc') {
                 foreach (@{$cmsmap{$cms}{$area}}) {
                     $importareas{$_} = 1;
                 }
@@ -640,23 +592,23 @@ sub display_three {
             for (my $i=0; $i<@topurls; $i++) {
                 my $url = &unescape($topurls[$i]);
                 my $name = &unescape($topnames[$i]);
-                push @imports, $name, $url;
+                push(@imports, [$name, $url]);
             }
         } elsif ($toplevel eq 'newfolder') {
             my $url = &unescape("/uploaded/$cdom/$crs/$timenow/sequences/Top.sequence");
             my $name = &unescape("$env{'form.foldername'}");
-            push @imports, $name, $url;
+            push(@imports, [$name, $url]);
         }
         my $errtext='';
         my $fatal=0;
         ($errtext,$fatal)=  &Apache::londocs::mapread($crs,$cdom,$folder.'.sequence');
-        if ($#Apache::lonratedt::order<1) {
-            $Apache::lonratedt::order[0]=1;
-            $Apache::lonratedt::resources[1]='';
+        if ($#LONCAPA::map::order<1) {
+            $LONCAPA::map::order[0]=1;
+            $LONCAPA::map::resources[1]='';
         }
         my ($errtext,$fatal)=&Apache::londocs::group_import($crs,$cdom,$folder,'sequence','imsimport',@imports);
         if ($fatal) {
-            print STDERR "Fatal error during group_import\n";
+            &Apache::lonnet::logthis("Fatal error during group_import.");
         }
     }
     if ($tempdir =~ m/^\/home\/httpd\/perl\/tmp\/$crs\/\d{10}/) {
@@ -672,7 +624,7 @@ sub display_three {
        </td>
       </tr>
       <tr bgcolor='#CCCCFF'>
-       <td valign='middle'><img src='/res/adm/pages/bl_step5.gif'>
+       <td valign="middle"><img src="/res/adm/pages/bl_step5.gif" alt="5" />
        </td>
        <td width='100%' align='left'>&nbsp;&nbsp;
         <font face='arial,helvetica,sans-serif'><b>Your import is complete</b></font>