--- loncom/html/adm/helper/newslot.helper	2006/04/24 23:23:18	1.15
+++ loncom/html/adm/helper/newslot.helper	2008/12/21 16:51:28	1.24
@@ -1,5 +1,6 @@
 <helper title="Slot Creation" requiredpriv="mgq">
-  <state name="START" title="Specify Required Attributes">
+  <state name="START" title="Specify Required Attributes"
+         help="Slot_RequiredAttributes">
 
     <nextstate>OPTIONAL</nextstate>
 
@@ -30,7 +31,7 @@
       }
     </exec>
     <message>
-        Name: <br />&nbsp;&nbsp;&nbsp;
+        <br />Name: <br />&nbsp;&nbsp;&nbsp;
     </message>
     <string variable="name" size="30">
       <validator>
@@ -84,7 +85,8 @@
   </state>
 
 
-  <state name="OPTIONAL" title="Specify Optional Attributes">
+  <state name="OPTIONAL" title="Specify Optional Attributes"
+	 help="Slot_OptionalAttributes">
     <message>
         <p>Description:<br />&nbsp;&nbsp;&nbsp;
     </message>
@@ -110,7 +112,7 @@
         </validator>
       </date>
       <message>
-         </p><p>Maxium number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
+         </p><p>Maximum number of students allowed in this slot:<br />&nbsp;&nbsp;&nbsp;
       </message>
       <string variable="maxspace" size="4">
         <validator>
@@ -157,6 +159,20 @@
         delete($helper->{'VARS'}{'endunique'});
       </exec>
     </condition>
+
+    <message>
+      </p><p>Proctored access:
+    </message>
+    <choices variable="useproctor">
+      <choice computer='no'>No proctor checkin required for access.</choice>
+      <choice computer='yes'>Require proctored checkin for access.</choice>
+      <defaultvalue>
+        my $default=&{$helper->{DATA}{origslot}}('proctor');
+        if ($default) { return 'yes'; }
+        return 'no';
+      </defaultvalue>
+    </choices>
+
     <message>
       </p><p>Secret word proctors use to checkin users:<br />&nbsp;&nbsp;&nbsp;
     </message>
@@ -171,6 +187,8 @@
     <message>
       </p><p>Slot is:
     </message>
+    <helpicon file="Slot_ChoosingResources" />
+
     <choices variable="restricttosymb">
       <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
       <choice nextstate="RESOURCESELECT" computer='resource'>restricted to a specific resource.</choice>
@@ -180,6 +198,7 @@
         return 'any';
       </defaultvalue>
     </choices>
+    
     <message>
 	</p><p>IP restrictions:<br />&nbsp;&nbsp;&nbsp;      
     </message>
@@ -209,22 +228,22 @@
   </state>
 
 
-  <state name="PROCTOR" title="Specify Proctors">
+  <state name="PROCTOR" title="Specify Proctors"
+	 help="Slot_SpecifyProctors">
 
-    <nextstate>FINISH</nextstate>
+    <skip>
+      <clause>$helper->{'VARS'}{'useproctor'} eq 'no'</clause>
+      <nextstate>RESTRICTUSER</nextstate>
+    </skip>
 
-    <condition>
-       <clause>$helper->{'VARS'}{'type'} eq 'schedulable_student'</clause>
-       <nextstate>RESTRICTUSER</nextstate>
-    </condition>
+    <nextstate>RESTRICTUSER</nextstate>
 
     <student variable="proctor" multichoice="1" coursepersonnel="1"
-             activeonly="1" emptyallowed="1">
+             activeonly="1" emptyallowed="0">
       <defaultvalue>
         my @defaults;
         my $default=&{$helper->{DATA}{origslot}}('proctor');
         if ($default) {
-	    $default=~ tr/@/:/;
 	    @defaults=(split(',',$default)); 
 	}
         return @defaults;
@@ -233,7 +252,13 @@
   </state>
 
 
-  <state name="RESTRICTUSER" title="Restrict slot availability">
+  <state name="RESTRICTUSER" title="Restrict slot availability"
+	 help="Slot_RestrictAvailibility">
+    <skip>
+       <clause>$helper->{'VARS'}{'type'} ne 'schedulable_student'</clause>
+       <nextstate>FINISH</nextstate>
+    </skip>
+
     <nextstate>FINISH</nextstate>
     <message>
       <p>Slots are by default available to all users in a course, if you would like this slot to be restricted to a subset of users you can specify restrictions.</p>
@@ -288,13 +313,16 @@
 				     $helper->{'VARS'}{'endunique'}];
 	}
 
-        if ( $helper->{'VARS'}{'proctor'} =~/\S/ ) {
+        if ( $helper->{'VARS'}{'useproctor'} eq 'yes'
+	     && $helper->{'VARS'}{'proctor'} =~/\S/ ) {
 	    my @names;
+	    # just need the username/domain throw away the other data 
+            # that <student> returns
 	    foreach my $user (split(/\|\|\|/, $helper->{'VARS'}{'proctor'})) {
 		my ($uname,$udomain)=split(/:/,$user);
-		push(@names,"$uname\@$udomain");
+		push(@names,"$uname:$udomain");
 	    }
-	    # make sure the usenrmaes are unique
+	    # make sure the usernmaes are unique
 	    my %proctors = map { ($_,1) } @names;
 	    $slot{'proctor'}=join(',',sort(keys(%proctors)));
 	}
@@ -306,8 +334,9 @@
 	}
 
         if ( $helper->{'VARS'}{'allowedusers'} =~/\S/ ) {
-
 	    my @names;
+	    # just need the username/domain throw away the other data 
+            # that <student> returns
 	    foreach my $item (split(/\|\|\|/,
 				    $helper->{'VARS'}{'allowedusers'})) {
 		my ($uname,$udomain)=split(/:/,$item);