--- loncom/html/adm/helper/newslot.helper	2006/05/09 19:10:39	1.18
+++ loncom/html/adm/helper/newslot.helper	2006/12/18 15:14:37	1.21
@@ -29,8 +29,14 @@
 	  return $slot{$name}{$which};
       }
     </exec>
+	<message>
+	    Help on required attributes
+	</message>
+    <helpicon file="Slot_RequiredAttributes">
+         Required Attributes
+    </helpicon>
     <message>
-        Name: <br />&nbsp;&nbsp;&nbsp;
+        <br />Name: <br />&nbsp;&nbsp;&nbsp;
     </message>
     <string variable="name" size="30">
       <validator>
@@ -85,6 +91,13 @@
 
 
   <state name="OPTIONAL" title="Specify Optional Attributes">
+	<message>
+	    Help on optional attributes
+	</message>
+    <helpicon file="Slot_OptionalAttributes">
+         Optional Attributes
+    </helpicon>
+  
     <message>
         <p>Description:<br />&nbsp;&nbsp;&nbsp;
     </message>
@@ -157,6 +170,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 +198,10 @@
     <message>
       </p><p>Slot is:
     </message>
+    <helpicon file="Slot_ChoosingResources">
+         Resource Restriction
+    </helpicon>
+
     <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 +211,7 @@
         return 'any';
       </defaultvalue>
     </choices>
+    
     <message>
 	</p><p>IP restrictions:<br />&nbsp;&nbsp;&nbsp;      
     </message>
@@ -211,22 +243,18 @@
 
   <state name="PROCTOR" title="Specify Proctors">
 
-    <nextstate>FINISH</nextstate>
-
-    <condition>
-       <clause>$helper->{'VARS'}{'type'} eq 'schedulable_student'</clause>
-       <nextstate>RESTRICTUSER</nextstate>
-    </condition>
-
-    <choices variable="noproctor">
-      <choice computer='no'>No proctor checkin required for access.</choice>
-      <choice computer='yes'>Require proctored access.</choice>
-      <defaultvalue>
-        my $default=&{$helper->{DATA}{origslot}}('proctor');
-        if ($default) { return 'yes'; }
-        return 'no';
-      </defaultvalue>
-    </choices>
+    <skip>
+      <clause>$helper->{'VARS'}{'useproctor'} eq 'no'</clause>
+      <nextstate>RESTRICTUSER</nextstate>
+    </skip>
+
+    <nextstate>RESTRICTUSER</nextstate>
+	<message>
+	    Specifying Proctors
+	</message>
+    <helpicon file="Slot_SpecifyProctors">
+         Specifying Proctors
+    </helpicon>
 
     <student variable="proctor" multichoice="1" coursepersonnel="1"
              activeonly="1" emptyallowed="1">
@@ -243,10 +271,18 @@
 
 
   <state name="RESTRICTUSER" title="Restrict slot availability">
+    <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>
     </message>
+    <helpicon file="Slot_RestrictAvailibility">
+         Restrict Availibility
+    </helpicon>
 
     <message>
       Select sections to limit slot availability to: <br />&nbsp;&nbsp;&nbsp;
@@ -297,7 +333,8 @@
 				     $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