--- loncom/imspackages/imsimportdocs.pm	2005/10/27 18:19:36	1.14
+++ loncom/imspackages/imsimportdocs.pm	2006/03/24 17:36:27	1.17
@@ -156,9 +156,10 @@ sub handler {
 # does this user have privileges to post, etc?
     my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
     unless ($allowed) {
-        $r->print("<html><head><title>The LearningOnline Network with CAPA</title></head>");
-        $r->print(&Apache::loncommon::bodytag('Import IMS package',undef,'',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.').'</body></html>');
+        $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());
         return OK;
     }
 
@@ -173,20 +174,15 @@ sub handler {
         &jscript_three(\$javascript);
     }
 
+    $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,});
 # print screen
-    $r->print(<<ENDHEAD);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-<script type="text/javascript">
-<!--
-$javascript
--->
-</script>
-</head>
-ENDHEAD
-# -------------------------------------------------------------------- Body tag
-    $r->print(&Apache::loncommon::bodytag('Import IMS package',undef,'',1));
+    $r->print($start_page);
+
     if ($env{'form.phase'} eq 'one') {
         &display_one($r);       
     } elsif ($env{'form.phase'} eq 'two') {
@@ -194,7 +190,7 @@ ENDHEAD
     } elsif ($env{'form.phase'} eq 'three') {
         &display_three($r,$coursenum,$coursedom,$uname,$udom,\@areas,%cmsmap);
     }   
-    $r->print("</body><html>");
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 } 
 
@@ -230,11 +226,11 @@ sub display_one {
         <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 value='bb5'>Blackboard 5
-         <option value='bb6'>Blackboard 6
-         <option value='angel'>ANGEL
-         <option value='webct4'>WebCT 4
+         <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>
@@ -278,10 +274,10 @@ Please choose the CMS used to create you
         <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="Exit now" onClick="javascript:self.close()" />
           </td>
           <td align='right'>
-           <input type="button" name="nextpage" value="Upload IMS package" onClick="javascript:nextPage()">
+           <input type="button" name="nextpage" value="Upload IMS package" onClick="javascript:nextPage()" />
           </td>
          </tr>
         </table>
@@ -336,7 +332,7 @@ sub display_two {
         $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 'webct4') {
+                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} ++;
@@ -403,13 +399,13 @@ ENDBLOCK
                     if ($area eq 'board') {
                         $r->print("            <td align='left'><font face='arial,helvetica,sans-serif'>&nbsp;&nbsp;
                  <select name='db_handling'>
-                  <option value='-2'>&lt;-- Check Import first
+                  <option value='-2'>&lt;-- Check Import first</option>
                  </select></font>
                 </td>");
                     } elsif ($area eq 'users') {
                         $r->print("            <td align='left'><font face='arial,helvetica,sans-serif'>&nbsp;&nbsp;
                  <select name='user_handling'>
-                  <option value='-2'>&lt;-- Check Import first
+                  <option value='-2'>&lt;-- Check Import first</option>
                  </select>
                  </font>        
                 </td>");
@@ -449,10 +445,10 @@ ENDBLOCK
        <td>
         <table border='0'>
          <tr>
-          <td><font face='arial,helvetica,sans-serif'><input type="radio" name="toplevel" value="newfolder" />Display listing of contents in a new folder, with folder name:&nbsp;&nbsp;&nbsp;<input type="text" name="foldername" size="15" value="Type Name Here" /></font></td>
+          <td><font face='arial,helvetica,sans-serif'><label><input type="radio" name="toplevel" value="newfolder" />Display listing of contents in a new folder, with folder name:</label>&nbsp;&nbsp;&nbsp;<input type="text" name="foldername" size="15" value="Type Name Here" /></font></td>
          </tr>
          <tr>
-          <td><font face='arial,helvetica,sans-serif'><input type="radio" name="toplevel" value="oldfolder" />Append listing of contents of top level of package to contents list for the current folder.</font></td>
+          <td><font face='arial,helvetica,sans-serif'><label><input type="radio" name="toplevel" value="oldfolder" />Append listing of contents of top level of package to contents list for the current folder.</label></font></td>
          </tr>
         </table>
        </td>
@@ -477,10 +473,10 @@ 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='Exit now' onClick="javascript:self.close()" />
           </td>
           <td align='right'>
-           <input type="button" name="nextpage" value="Complete Import" onClick="javascript:nextPage($counter)">
+           <input type="button" name="nextpage" value="Complete Import" onClick="javascript:nextPage($counter)" />
           </td>
          </tr>
         </table>
@@ -690,7 +686,7 @@ ENDBLOCK
            <input type="hidden" name="$env{'request.role'}" value="1" />
            <input type="button" value="|;
     $initblock .= &mt('re-initializing course');
-    $initblock .= qq|" onClick="javascript:init(this.form)"/>|;
+    $initblock .= qq|" onClick="javascript:init(this.form)" />|;
     $initblock .= ', '.&mt('or the next time you log in.');
     $initblock .= qq|</font></h3></form>|;  
     $r->print($initblock);

Display listing of contents in a new folder, with folder name:	Display listing of contents in a new folder, with folder name:
Append listing of contents of top level of package to contents list for the current folder.	Append listing of contents of top level of package to contents list for the current folder.