--- loncom/imspackages/imsimportdocs.pm	2006/03/23 23:12:21	1.15
+++ loncom/imspackages/imsimportdocs.pm	2006/03/24 17:36:27	1.17
@@ -226,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>
@@ -274,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>
@@ -332,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} ++;
@@ -399,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>");
@@ -445,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>
@@ -473,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>
@@ -686,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);