--- loncom/interface/loncreatecourse.pm	2016/04/04 01:09:48	1.159
+++ loncom/interface/loncreatecourse.pm	2016/04/15 19:27:37	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.159 2016/04/04 01:09:48 raeburn Exp $
+# $Id: loncreatecourse.pm,v 1.162 2016/04/15 19:27:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,7 +118,7 @@ sub print_course_creation_page {
     my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
     my $access_table = &Apache::lonuserutils::date_setting_table($starttime,
                                              $endtime,'create_defaultdates');
-    if ($crstype eq 'Course') {
+    if (($crstype eq 'Course') || ($crstype eq 'Placement')) {
         $enroll_table = &Apache::lonuserutils::date_setting_table($starttime,
                                               $endtime,'create_enrolldates');
         ($krbdef,$krbdefdom) =
@@ -132,7 +132,7 @@ sub print_course_creation_page {
         $krbform = &Apache::loncommon::authform_kerberos(%param);
         $intform = &Apache::loncommon::authform_internal(%param);
         $locform = &Apache::loncommon::authform_local(%param);
-    } elsif ($crstype eq 'Community') {
+    } else {
         my $title_alert = &mt('A Community title is required');
         my $coord_alert = &mt('The username of the Coordinator is required');
         &js_escape(\$title_alert);
@@ -149,24 +149,6 @@ function validate(formname) {
     formname.submit();
 }
         |;
-    } else {
-        my $title_alert = &mt('A Placement Test title is required');
-        my $coord_alert = &mt('The username of the Course Coordinator is required');
-        &js_escape(\$title_alert);
-        &js_escape(\$coord_alert);
-        $javascript_validations = qq|
-function validate(formname) {
-    if (formname.title == '') {
-        alert("$title_alert");
-        return;
-    }
-    if (formname.ccuname == '') {
-        alert("$coord_alert");
-    }
-    formname.submit();
-}
-        |;
-        
     }
     my %lt=&Apache::lonlocal::texthash(
 		    'cinf' => "Course Information",
@@ -234,6 +216,7 @@ function validate(formname) {
                     'cgrq' => 'Set a quota for the total disk space available for storage of course group portfolio files',
                     'opco' => 'Open Course',
                     'opcm' => 'Open Community',
+                    'oppt' => 'Open Placement Test',
 	       );
     $lt{'kaut'} = &mt('Key authority ([_1]id:domain[_2]) if other than course','<tt>','</tt>');
     $lt{'toin'} = &mt('to interface with institutional data, e.g., [_1]fs13glg231[_2] for [_3]Fall 2013 Geology 231[_4]','<tt>','</tt>','<i>','</i>');
@@ -349,14 +332,16 @@ END
              .'<input type="text" size="30" name="crsid" />'
              .&Apache::lonhtmlcommon::row_closure()
     );
-    if ($crstype eq 'Course') {
+    if (($crstype eq 'Course') || ($crstype eq 'Placement')) {
         $r->print(&Apache::lonhtmlcommon::row_headline()
                  .'<h3>'.$lt{'iinf'}.'</h3>'
-                 .$lt{'stat'}.' '
-                 .&mt('Default credits can also be specified, if different from the domain defaults (official courses: [_1]; unofficial courses: [_2]; textbook courses: [_3]).',
-                      $domdefaults{'officialcredits'},$domdefaults{'unofficialcredits'},$domdefaults{'textbookcredits'})
-                 .&Apache::lonhtmlcommon::row_closure()
-
+                 .$lt{'stat'});
+        if ($crstype eq 'Course') {
+            $r->print(' '
+                     .&mt('Default credits can also be specified, if different from the domain defaults (official courses: [_1]; unofficial courses: [_2]; textbook courses: [_3]).',
+                          $domdefaults{'officialcredits'},$domdefaults{'unofficialcredits'},$domdefaults{'textbookcredits'}));
+        }
+        $r->print(&Apache::lonhtmlcommon::row_closure()
                  .&Apache::lonhtmlcommon::row_title($lt{'ccod'})
                  .'<input type="text" size="30" name="crscode" />'
                  .'<br />('.$lt{'toin'}.')'
@@ -372,7 +357,8 @@ END
                  .'<br />('.$lt{'cscs'}.')'
                  .&Apache::lonhtmlcommon::row_closure()
         );
-        if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) {
+        if (($crstype eq 'Course') && ($domdefaults{'officialcredits'} || 
+            $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'})) {
             $r->print(&Apache::lonhtmlcommon::row_title($lt{'ccre'})
                      .'<input type="text" size="3" name="defaultcredits" />'
                      .'<br />('.$lt{'cred'}.')'
@@ -530,7 +516,7 @@ END
                  .'<input type="text" name="reshome" size="30" value="/res/'.$defdom.'/" />'
                  .&Apache::lonhtmlcommon::row_closure()
     );
-    if ($crstype eq 'Course') {
+    unless ($crstype eq 'Community') {
         $r->print(&Apache::lonhtmlcommon::row_headline()
                  .'<h3>'.$lt{'aens'}.'</h3>'
                  .&Apache::lonhtmlcommon::row_closure()
@@ -608,7 +594,7 @@ END
 <p>
 <input type="hidden" name="prevphase" value="placementone" />
 <input type="hidden" name="phase" value="placementtwo" />
-<input type="submit" value="'.$lt{'opcm'}.'" />
+<input type="button" onclick="verify_message(this.form)" value="'.$lt{'oppt'}.'" />
 </p>'
         );
     }
@@ -1335,7 +1321,6 @@ sub handler {
             }
         }
     }
-print STDERR "cacreate Community $cancreate{'Community'} cancreate Placement $cancreate{'Placement'}\n";
 
     if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
        &Apache::loncommon::content_type($r,'text/html');