--- loncom/imspackages/imsimport.pm	2006/03/23 23:12:21	1.14
+++ loncom/imspackages/imsimport.pm	2006/03/27 18:39:55	1.17
@@ -46,6 +46,8 @@ sub jscript_one {
 					'js_ready'    => 1,});
     my $end_page = 
 	&Apache::loncommon::end_page({'js_ready' => 1,});
+    $start_page =~ s/\n/\\n/g;
+    $end_page =~ s/\n/\\n/g;
 
     $$jsref = <<"END_OF_ONE";
 function verify() {
@@ -78,10 +80,10 @@ function createWin() {
   newWindow.document.write("<tr><td width='2'>&nbsp;</td><td width='3'>&nbsp;</td>\\n")
   newWindow.document.write("<td><form name='fileaction' action='/adm/cfile' method='post'>\\n")
   newWindow.document.write("<font face='arial,helvetica,sans-serif'>Enter the name of the new directory where you will store the contents of your IMS package.<br /><br />")
-  newWindow.document.write("<input type='hidden' name='filename' value='$fullpath'>")
-  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='hidden' name='filename' value='$fullpath' />")
+  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='Go' onClick='document.fileaction.submit();' />")
   newWindow.document.write("</td></tr>\\n")
   newWindow.document.write("</table>")
@@ -300,11 +302,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>
@@ -327,7 +329,7 @@ Please choose the CMS used to create you
        <td>&nbsp;</td>
        <td>
         <font face='Arial,Helvetica,sans-serif'>
-Please choose a destination LON-CAPA directory in which to store the contents of the IMS package file. <input type="button" name="createdir" value="Create Directory" onClick="javascript:createWin()"><input type="hidden" name="newdir" value=""></font>
+Please choose a destination LON-CAPA directory in which to store the contents of the IMS package file. <input type="button" name="createdir" value="Create Directory" onClick="javascript:createWin()" /><input type="hidden" name="newdir" value="" /></font>
        </td>
       </tr>
       <tr>
@@ -339,9 +341,9 @@ Please choose a destination LON-CAPA dir
       </tr>
       <tr>
        <td colspan='2'>
-          <input type="hidden" name="uploaduname" value="$uname">
-          <input type="hidden" name="filename" value="$fn">
-          <input type="hidden" name="phase" value="three">
+          <input type="hidden" name="uploaduname" value="$uname" />
+          <input type="hidden" name="filename" value="$fn" />
+          <input type="hidden" name="phase" value="three" />
        </td>
       </tr>
       <tr>
@@ -352,10 +354,10 @@ Please choose a destination LON-CAPA dir
         <table border='0' cellspacing='0' cellpadding='0' width="100%">
          <tr>
           <td align='left'>
-           <input type='button' name='exitpage' value='Exit now' onClick="javascript:location.href='$fullpath'">
+           <input type='button' name='exitpage' value='Exit now' onClick="javascript:location.href='$fullpath'" />
           </td>
           <td align='right'>
-           <input type="button" name="nextpage" value="Proceed" onClick="javascript:nextPage()">
+           <input type="button" name="nextpage" value="Proceed" onClick="javascript:nextPage()" />
           </td>
          </tr>
         </table>
@@ -411,7 +413,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} ++;
@@ -490,13 +492,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>");
@@ -543,7 +545,7 @@ ENDBLOCKTWO
 <br /><br />
 Choose course:&nbsp;&nbsp;
                  <select name='targetcourse'>
-                  <option value='-1'>Not required
+                  <option value='-1'>Not required</option>
                  </select></font>
        </td>
       </tr>
@@ -587,10 +589,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:location.href='$fullpath'">
+           <input type='button' name='exitpage' value='Exit now' onClick="javascript:location.href='$fullpath'" />
           </td>
           <td align='right'>
-           <input type="button" name="nextpage" value="Import package" onClick="javascript:nextPage($counter)">
+           <input type="button" name="nextpage" value="Import package" onClick="javascript:nextPage($counter)" />
           </td>
          </tr>
         </table>