--- loncom/interface/loncreatecourse.pm	2004/08/25 20:48:04	1.66
+++ loncom/interface/loncreatecourse.pm	2004/09/25 17:52:03	1.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.66 2004/08/25 20:48:04 albertel Exp $
+# $Id: loncreatecourse.pm,v 1.68 2004/09/25 17:52:03 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -358,28 +358,41 @@ $helplink
 <form action="/adm/createcourse" method="post" name="ccrs">
 <h2>$lt{'cinf'}</h2>
 <p>
-<b>$lt{'ctit'}:</b>
-<input type="text" size="50" name="title">
+<label><b>$lt{'ctit'}:</b>
+<input type="text" size="50" name="title" /></label>
 </p><p>
-<b>$lt{'chsr'}:</b>$course_home
-</p><p>
-<b>$lt{'cidn'} ($lt{'opt'})</b>
-<input type="text" size="30" name="crsid">
+<label>
+    <b>$lt{'chsr'}:</b>$course_home
+</label>
+</p><p>
+<label>
+    <b>$lt{'cidn'} ($lt{'opt'})</b>
+    <input type="text" size="30" name="crsid" />
+</label>
 </p><p>
 <h2>$lt{'iinf'}</h2>
 <p>
 $lt{'stat'}
 </p><p>
-<b>$lt{'ccod'}</b>
-<input type="text" size="30" name="crscode" /><br/>
+<label>
+    <b>$lt{'ccod'}</b>
+    <input type="text" size="30" name="crscode" />
+</label>
+<br/>
 ($lt{'toin'})
 </p><p>
-<b>$lt{'snid'}</b>
- <input type="text" size="30" name="crssections" /><br/>
+<label>
+    <b>$lt{'snid'}</b>
+    <input type="text" size="30" name="crssections" />
+</label>
+<br/>
 ($lt{'csli'})
 </p><p>
-<b>$lt{'crcs'}</b>
-<input type="text" size="30" name="crsxlist" /><br/>
+<label>
+    <b>$lt{'crcs'}</b>
+    <input type="text" size="30" name="crsxlist" />
+</label>
+<br/>
 ($lt{'cscs'})
 </p>
 <h2>$lt{'crco'}</h2>
@@ -387,61 +400,92 @@ $lt{'stat'}
 <tr><th>$lt{'cncr'}</th><th>$lt{'cecr'}</th></tr>
 <tr><td>
 <p>
-<b>$lt{'map'}:</b>
-<input type="text" size="50" name="topmap">
+<label>
+    <b>$lt{'map'}:</b>
+    <input type="text" size="50" name="topmap" />
+</label>
 <a href="javascript:openbrowser('ccrs','topmap')">$lt{'smap'}</a>
 </p><p>
-<b>$lt{'sacr'}</b><br /> 
+<label for="nonstd"><b>$lt{'sacr'}</b></label>
+<br />
 ($lt{'ocik'}):
-<input type="checkbox" name="nonstandard">
-</p>
-<p>
+<input id="nonstd" type="checkbox" name="nonstandard" />
+</p><p>
 <b>$lt{'fres'}</b><br />($lt{'stco'}):
-<input type="radio" name="firstres" value="blank">$lt{'blnk'}
+<label>
+    <input type="radio" name="firstres" value="blank" />$lt{'blnk'}
+</label>
 &nbsp;
-<input type="radio" name="firstres" value="syl" checked>$lt{'sllb'}
+<label>
+    <input type="radio" name="firstres" value="syl" checked />$lt{'sllb'}
+</label>
 &nbsp;
-<input type="radio" name="firstres" value="nav">$lt{'navi'}
+<label>
+    <input type="radio" name="firstres" value="nav" />$lt{'navi'}
+</label>
 </p>
 </td><td>
-$lt{'cid'}: <input input type="text" size="25" name="clonecourse" value="" />
+<label>
+    $lt{'cid'}: <input type="text" size="25" name="clonecourse" value="" />
+</label>
+<br />
+<label>
+    $lt{'dmn'}: $cloneform
+</label>
 <br />
-$lt{'dmn'}: 
-$cloneform<br />&nbsp;<br />
+&nbsp;<br />
 $lt{'asov'}.
 </td></tr>
 </table>
 <h2>$lt{'assp'}</h2>
 <p>
-<b>$lt{'oaas'}: </b>
-<input type="checkbox" name="openall" />
+<label>
+    <b>$lt{'oaas'}: </b>
+    <input type="checkbox" name="openall" />
+</label>
 </p>
 <h2>$lt{'mssg'}</h2>
 <p>
-<b>$lt{'scpf'}: </b>
-<input type="checkbox" name="setpolicy" checked>
+<label>
+    <b>$lt{'scpf'}: </b>
+    <input type="checkbox" name="setpolicy" checked />
+</label>
 <br />
-<b>$lt{'scfc'}: </b>
-<input type="checkbox" name="setcontent" checked>
+<label>
+    <b>$lt{'scfc'}: </b>
+    <input type="checkbox" name="setcontent" checked />
+</label>
 </p>
 <h2>$lt{'cmmn'}</h2>
 <p>
-<b>$lt{'dsrd'}: </b>
-<input type="checkbox" name="disresdis" /> <br />
-<b>$lt{'dsuc'}: </b>
-<input type="checkbox" name="disablechat" />
+<label>
+    <b>$lt{'dsrd'}: </b>
+    <input type="checkbox" name="disresdis" />
+</label>
+<br />
+<label>
+    <b>$lt{'dsuc'}: </b>
+    <input type="checkbox" name="disablechat" />
+</label>
 </p>
 <h2>$lt{'acco'}</h2>
 <p>
-<b>$lt{'snak'}: </b>
-<input type="checkbox" name="setkeys" /><br />
-<b>$lt{'kaut'}: </b>
-<input type="text" size="30" name="keyauth" />
+<label>
+    <b>$lt{'snak'}: </b>
+    <input type="checkbox" name="setkeys" />
+</label>
+<br />
+<label>
+    <b>$lt{'kaut'}: </b>
+    <input type="text" size="30" name="keyauth" />
+</label>
 </p>
 <h2>$lt{'rshm'}</h2>
 <p>
-<b>$lt{'rshm'}: </b>
-<input type="text" name="reshome" size="30" value="/res/$defdom/" />
+<label>
+    <b>$lt{'rshm'}: </b>
+    <input type="text" name="reshome" size="30" value="/res/$defdom/" />
+</label>
 </p>
 <p>
 <h2>$lt{'aens'}</h2>
@@ -449,10 +493,13 @@ $lt{'aesc'}
 </p>
 <p>
 <b>$lt{'aadd'}</b>
-<input type="radio" name="autoadds" value="1" />$lt{'yes'} <input type="radio" name="autoadds" value="0" checked="true" />$lt{'no'}
+<label><input type="radio" name="autoadds" value="1" />$lt{'yes'}</label> 
+<label><input type="radio" name="autoadds" value="0" checked="true" />$lt{'no'}
+</label>
 </p><p>
 <b>$lt{'audr'}</b>
-<input type="radio" name="autodrops" value="1" />$lt{'yes'} <input type="radio" name="autodrops" value="0" checked="true" />$lt{'no'}
+<label><input type="radio" name="autodrops" value="1" />$lt{'yes'}</label> 
+<label><input type="radio" name="autodrops" value="0" checked="true" />$lt{'no'}</label>
 </p><p>
 <b>$lt{'dacu'}</b>
 $enroll_table
@@ -471,24 +518,40 @@ $locform
 </p><p>
 <b>$lt{'nech'}</b><br />
 $lt{'nccl'}<br/>
-<input type="radio" name="notify" value="1" />$lt{'yes'} <input type="radio" name="notify"
-value="0" checked="true" />$lt{'no'}
-</p><p>
-<b>$lt{'irsp'}</b> <input type="radio" name="showphotos" value="1" />$lt{'yes'} <input type="radio" name="showphotos" value="0" checked="true" />$lt{'no'}
+<label>
+    <input type="radio" name="notify" value="1" />$lt{'yes'}
+</label> 
+<label>
+    <input type="radio" name="notify" value="0" checked="true" />$lt{'no'}
+</label>
+</p><p>
+<b>$lt{'irsp'}</b>
+<label>
+    <input type="radio" name="showphotos" value="1" />$lt{'yes'}
+</label> 
+<label>
+    <input type="radio" name="showphotos" value="0" checked="true" />$lt{'no'}
+</label>
 </p>
 <hr />
 <h2>$lt{'cc'}</h2>
 <p>
-<b>$lt{'user'}:</b> <input type="text" size="15" name="ccuname" />
-</p><p>
-<b>$lt{'dmn'}:</b> $domform
-</p><p>
-<b>$lt{'ierc'}:</b>
-<input type="checkbox" name="expireown" checked>
+<label>
+    <b>$lt{'user'}:</b> <input type="text" size="15" name="ccuname" />
+</label>
+</p><p>
+<label>
+    <b>$lt{'dmn'}:</b> $domform
+</label>
+</p><p>
+<label>
+    <b>$lt{'ierc'}:</b>
+    <input type="checkbox" name="expireown" checked />
+</label>
 </p>
 <p>
 <input type="hidden" name="phase" value="two" />
-<input type="button" onClick="verify_message(this.form)" value="$lt{'opco'}">
+<input type="button" onClick="verify_message(this.form)" value="$lt{'opco'}" />
 </p>
 </form>
 </body>
@@ -583,6 +646,10 @@ ENDENHEAD
 	    $cenv{'url'}=$oldcenv{'url'};
 # Restore title
 	    $cenv{'description'}=$oldcenv{'description'};
+# restore grading mode
+	    if (defined($oldcenv{'grading'})) {
+		$cenv{'grading'}=$oldcenv{'grading'};
+	    }
 # Mark as cloned
 	    $cenv{'clonedfrom'}=$cloneid;
 	    delete($cenv{'default_enrollment_start_date'});
@@ -758,7 +825,7 @@ ENDENHEAD
     $cenv{'internal.encpref'}=100+int(9*rand(99));
     #
     # By default, use standard grading
-    $cenv{'grading'} = 'standard';
+    if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; }
 
     $r->print('<br />'.&mt('Setting environment').': '.                 
           &Apache::lonnet::put('environment',\%cenv,$crsudom,$crsunum).'<br>');