--- loncom/imspackages/imsimportdocs.pm	2009/11/20 14:39:32	1.26
+++ loncom/imspackages/imsimportdocs.pm	2009/11/20 18:25:34	1.29
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: imsimportdocs.pm,v 1.26 2009/11/20 14:39:32 bisitz Exp $
+# $Id: imsimportdocs.pm,v 1.29 2009/11/20 18:25:34 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -218,7 +218,11 @@ sub display_one {
     $r->print(
         '<form action="/adm/imsimportdocs" method="post"'
        .' enctype="multipart/form-data" name="pickcms">'
-       .&Apache::lonhtmlcommon::topic_bar(
+    );
+
+    # Step 1
+    $r->print(
+       &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">'
@@ -229,6 +233,8 @@ sub display_one {
        .'<option value="webctce4">WebCT 4 Campus Edition</option>'
        .'</select>'
     );
+
+    # Step 2
     $r->print(
        &Apache::lonhtmlcommon::topic_bar(
            2,&mt('Locate the IMS content package you wish to upload'))
@@ -237,6 +243,8 @@ sub display_one {
       .&mt('File:')
       .' <input type="file" name="uploadname" size="40" />'
     );
+
+    # Buttons
     $r->print(
        '<hr />'
       .'<p>'
@@ -247,6 +255,8 @@ sub display_one {
       .' onclick="javascript:nextPage()" />'
       .'</p>'
     );
+
+    $r->print('</form>');
 }
 
 
@@ -338,7 +348,7 @@ sub display_two {
     # Start output: Step 3 and step 4
 
     $r->print(
-        '<form name="pickoptions" method="post">'
+        '<form name="pickoptions" method="post" action="">'
        .&Apache::lonhtmlcommon::topic_bar(
             3,&mt('Choose which content types you wish to import'))
        .'<p>'
@@ -423,7 +433,7 @@ sub display_two {
        .' <input type="text" name="foldername" size="15" value="'.&mt('Type Name Here').'" />'
        .'<br />'
        .'<label>'
-       .'<input type="radio" name="toplevel" value="oldfolder" />'
+       .'<input type="radio" name="toplevel" value="oldfolder" checked="checked" />'
        .&mt('Append listing of contents of top level of package to contents list for the current folder.')
        .'</label>'
     );
@@ -609,47 +619,30 @@ sub display_three {
     if ($tempdir =~ m/^\/home\/httpd\/perl\/tmp\/$crs\/\d{10}/) {
         system("rm -r -f $tempdir");
     }
-    $r->print(<<ENDBLOCK);
-  <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_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>
-       </td>
-      </tr>
-      <tr>
-       <td colspan='2'>&nbsp;</td>
-      </tr>
-      <tr>
-       <td>&nbsp;</td>
-       <td>
-ENDBLOCK
-    my $initblock = qq|  
-         <form method="post" action="/adm/roles" target="loncapaclient" name="importDone">
-           <input type="hidden" name="orgurl" value="/adm/coursedocs" />
-           <input type="hidden" name="selectrole" value="1" />
-           <h3><font color="red">Changes will become active for your current session after
-           <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 .= ', '.&mt('or the next time you log in.');
-    $initblock .= qq|</font></h3></form>|;  
-    $r->print($initblock);
-    $r->print(<<ENDBLOCKTWO);
-     </table>
-    </td>
-   </tr>
-  </table>
-ENDBLOCKTWO
+
+    # All done, display success message
+    $r->print(
+        '<p class="LC_success">'
+       .&mt('Your import is complete.')
+       .'</p>'
+    );
+    # Re-initialize Button
+    my $initbutton =
+           '<input type="button" value="'
+          .&mt('re-initializing course')
+          .'" onclick="javascript:init(this.form)" />';
+    $r->print(
+        '<form method="post" action="/adm/roles" target="loncapaclient" name="importDone">'
+       .'<input type="hidden" name="orgurl" value="/adm/coursedocs" />'
+       .'<input type="hidden" name="selectrole" value="1" />'
+       .'<input type="hidden" name="'.$env{'request.role'}.'" value="1" />'
+       .'<p class="LC_warning">'
+       .&mt('Changes will become active for your current session after [_1]'
+           .', or the next time you log in.'
+            ,$initbutton)
+       .'</p>'
+       .'</form>'
+    );
 }
 
 1;