--- loncom/imspackages/imsimportdocs.pm	2009/11/20 17:01:11	1.28
+++ 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.28 2009/11/20 17:01:11 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>'
@@ -620,7 +630,7 @@ sub display_three {
     my $initbutton =
            '<input type="button" value="'
           .&mt('re-initializing course')
-          .'" onClick="javascript:init(this.form)" />';
+          .'" 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" />'