--- loncom/imspackages/imsimportdocs.pm	2009/08/17 03:52:09	1.23
+++ loncom/imspackages/imsimportdocs.pm	2009/11/20 11:16:59	1.25
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: imsimportdocs.pm,v 1.23 2009/08/17 03:52:09 raeburn Exp $
+# $Id: imsimportdocs.pm,v 1.25 2009/11/20 11:16:59 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,9 +165,15 @@ sub handler {
     my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
     unless ($allowed) {
         $r->print(&Apache::loncommon::start_page('Import IMS package',undef,
-						 {'only_body' => 1,}));  
-        $r->print('<h3>'.&mt('Modification of Course Contents Disallowed').'</h3>'.&mt('Your current role does not grant you the right to modify course content in this course.').
-		  &Apache::loncommon::end_page());
+                                                 {'only_body' => 1,}));  
+        $r->print(
+            '<p class="LC_error">'
+           .&mt('Modification of Course Contents Disallowed')
+           .'</p><p>'
+           .&mt('Your current role does not grant you the right to modify course content in this course.')
+           .'</p>'
+           .&Apache::loncommon::end_page()
+        );
         return OK;
     }
 
@@ -183,11 +189,13 @@ sub handler {
     }
 
     $javascript = 
-	 "<script type=\"text/javascript\">\n".
-	 "//<!--\n$javascript\n// --></script>\n";
-    my $start_page = &Apache::loncommon::start_page('Import IMS package',
-						    $javascript,
-						    {'only_body' => 1,});
+        "<script type=\"text/javascript\">\n".
+        "//<!--\n$javascript\n// --></script>\n";
+    my $headline = 'Import IMS package';
+    my $start_page = &Apache::loncommon::start_page($headline,
+                                                    $javascript,
+                                                    {'only_body' => 1,})
+                    .'<h1>'.&mt($headline).'</h1>';
 # print screen
     $r->print($start_page);
 
@@ -207,96 +215,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" alt="1" />&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='angel5'>ANGEL 5.5</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" alt="2" />&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>'
+    );
 }
 
 
@@ -336,28 +286,57 @@ sub display_two {
                 users => 0,
                 );
 
-    if ($unzip_result eq 'ok') {
-        $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo,'choose',\%includedres,\%includeditems);
-        if ($manifest_result eq 'ok') {
-            foreach my $res (sort keys %resources) {
-                if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4') {
-                    foreach my $area (keys %{$cmsmap{$cms}}) {
-                        if ($resources{$res}{type} eq $cmsmap{$cms}{$area}) {
-                            $count{$area} ++;
-                        }
-                    }
-                } elsif ($cms eq 'angel5') {
-                    foreach my $area (keys %{$cmsmap{$cms}}) {
-                        if ($area eq 'doc') {
-                            if (grep/^$resources{$res}{type}$/,@{$cmsmap{$cms}{doc}}) {
-                                $count{$area} ++;
-                            }
-                        } elsif ($resources{$res}{type} eq $cmsmap{$cms}{$area}) {
-                            $count{$area} ++;
-                        }
+    if ($unzip_result ne 'ok') {
+        $r->print(
+            '<p class="LC_warning">'
+           .&mt('Processing of your IMS package failed because the file you'
+               .' uploaded could not be unzipped.')
+           .'</p>'
+        );
+        return();
+    }
+
+    # Get manifest file from package
+    $manifest_result = &Apache::imsprocessor::process_manifest(
+                           $cms,$tempdir,\%resources,\%items,\%hrefs,
+                           \%resinfo,'choose',\%includedres,\%includeditems);
+    if ($manifest_result ne 'ok') {
+        $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>'
+        );
+        return();
+    }
+
+    # Count areas depending on cms version
+    foreach my $res (sort keys %resources) {
+        if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4') {
+            foreach my $area (keys %{$cmsmap{$cms}}) {
+                if ($resources{$res}{type} eq $cmsmap{$cms}{$area}) {
+                    $count{$area} ++;
+                }
+            }
+        } elsif ($cms eq 'angel5') {
+            foreach my $area (keys %{$cmsmap{$cms}}) {
+                if ($area eq 'doc') {
+                    if (grep/^$resources{$res}{type}$/,@{$cmsmap{$cms}{doc}}) {
+                        $count{$area} ++;
                     }
+                } elsif ($resources{$res}{type} eq $cmsmap{$cms}{$area}) {
+                    $count{$area} ++;
                 }
             }
+        } else { # Unknown cms format
+            $r->print(
+                '<span class="LC_warning">'
+               .&mt('Unsupported IMS format: [_1]',$cms)
+               .'</span><br />'
+            );
+            # return();
+        }
+    }
+
             $r->print(<<ENDBLOCK);
 <form name="pickoptions" method="post">
   <table border='0' bgcolor='#F6F6F6'' cellspacing='0' cellpadding ='0' width='100%'>
@@ -442,7 +421,7 @@ ENDBLOCK
        <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>
@@ -481,7 +460,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,12 +474,6 @@ ENDBLOCK
    </tr>
   </table>
 ENDDOCUMENT
-        } else {
-            $r->print("Unpacking of your IMS package failed because an IMS manifest file was not located in the package\n");
-        }
-    } else {
-        $r->print("Processing of your IMS package failed because the file you uploaded could not be unzipped\n");
-    }
 }