--- loncom/html/adm/helper/newslot.helper	2018/06/27 14:35:09	1.30.4.1
+++ loncom/html/adm/helper/newslot.helper	2015/09/23 23:05:04	1.31
@@ -184,34 +184,11 @@
         delete($helper->{'VARS'}{'startreserve'});
         delete($helper->{'VARS'}{'endreserve'});
         delete($helper->{'VARS'}{'maxspace'});
+        delete($helper->{'VARS'}{'startunique'});
+        delete($helper->{'VARS'}{'endunique'});
       </exec>
-      <message>
-         </p><p>Period of time when this slot can only be uniquely assigned:<br />&nbsp;&nbsp;&nbsp;Start:
-      </message>
-      <date variable="startunique" hoursminutes="1" anytime="1">
-        <defaultvalue>
-          my $default=&{$helper->{DATA}{origslot}}('uniqueperiod','anytime');
-          if ($default eq 'anytime') { return 'anytime' };
-          if (ref($default)) { return $default->[0]; }
-          return 'anytime';
-        </defaultvalue>
-      </date>
-      <message><br />&nbsp;&nbsp;&nbsp;End: </message>
-      <date variable="endunique" hoursminutes="1" anytime="1">
-        <defaultvalue>
-          my $default=&{$helper->{DATA}{origslot}}('uniqueperiod','anytime');
-          if ($default eq 'anytime') { return 'anytime' };
-          if (ref($default)) { return $default->[1]; }
-          return 'anytime';
-        </defaultvalue>
-        <validator>
-           if (defined($val) && $val < $helper->{'VARS'}{'startunique'}) {
-               return 'End time must be later than the start time.';
-           }
-           return undef;
-        </validator>
-      </date>
     </condition>
+
     <message>
       </p><p>Proctored access:
     </message>
@@ -243,11 +220,19 @@
 
     <choices variable="restricttosymb">
       <choice nextstate="PROCTOR" computer='any'>usable for any resource.</choice>
+      <choice nextstate="MAPSELECT" computer='map'>restricted to resources in a specific folder/composite page.</choice>
       <choice nextstate="RESOURCESELECT" computer='resource'>restricted to a specific resource.</choice>
       <defaultvalue>
         my $default=&{$helper->{DATA}{origslot}}('symb');
-        if ($default) { return 'resource'; }
-        return 'any';
+        if ($default) {
+            if ($default =~ /\.(page|sequence)$/) {
+                return 'map';
+            } else {
+                return 'resource';
+            }
+        } else {
+            return 'any';
+        }
       </defaultvalue>
     </choices>
     
@@ -279,6 +264,18 @@
     </resource>    
   </state>
 
+  <state name="MAPSELECT" title="Specify Optional Attributes">
+
+    <nextstate>PROCTOR</nextstate>
+
+    <resource variable="symb">
+      <filterfunc>return $res->is_map()</filterfunc>
+      <valuefunc>return $res->symb()</valuefunc>
+      <defaultvalue>
+        return &{$helper->{DATA}{origslot}}('symb');
+      </defaultvalue>
+    </resource>
+  </state>
 
   <state name="PROCTOR" title="Specify Proctors"
 	 help="Slot_SpecifyProctors">