--- loncom/interface/slotrequest.pm 2006/05/30 12:46:09 1.63 +++ loncom/interface/slotrequest.pm 2006/06/16 19:49:00 1.64 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for requesting to have slots added to a students record # -# $Id: slotrequest.pm,v 1.63 2006/05/30 12:46:09 www Exp $ +# $Id: slotrequest.pm,v 1.64 2006/06/16 19:49:00 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -385,13 +385,13 @@ sub remove_registration_confirmation { 'no' => 'No',); $r->print(<<"END_CONFIRM");

$msg

-
+ $hidden_input
-
+
@@ -571,7 +571,7 @@ sub get_slot { $r->print("

Already have a reservation: $description1

"); if ($slot_name ne $env{'form.slotname'}) { $r->print(< +
@@ -616,7 +616,7 @@ STUFF $r->print(< Failed to reserve a spot for $description.

- + @@ -626,7 +626,7 @@ STUFF

or - +

@@ -767,7 +767,7 @@ sub show_choices { } my $escsymb=&escape($symb); $form=< +
@@ -871,7 +871,7 @@ sub remove_link { $symb = &escape($symb); return <<"END_LINK"; - ($remove) END_LINK @@ -888,11 +888,11 @@ sub show_table { my $available; if ($mgr eq 'F') { $r->print('
'); - $r->print(' + $r->print(' '); - $r->print('
+ $r->print('
'); $r->print('
'); @@ -979,13 +979,16 @@ sub show_table { my $name_filter = {'type' => $name_filter_type, 'value' => $env{'form.name_filter_value'},}; + #deleted slot filtering + #default to hide if no value + $env{'form.deleted'} ||= 'hide'; my $hide_radio = &Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide'); my $show_radio = &Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'show'); - $r->print('
+ $r->print(' '); $r->print('
'); $r->print(' @@ -1108,7 +1111,7 @@ sub show_table { my $unique; if (ref($slots{$slot}{'uniqueperiod'})) { - $unique=localtime($slots{$slot}{'uniqueperiod'}[0]).','. + $unique=localtime($slots{$slot}{'uniqueperiod'}[0]).', '. localtime($slots{$slot}{'uniqueperiod'}[1]); } @@ -1166,7 +1169,7 @@ sub show_table { EDITLINK my $delete=(<<"DELETELINK"); -Delete +Delete DELETELINK my $remove_all=&remove_link($slot,'remove all').'
'; @@ -1214,9 +1217,13 @@ DELETELINK if (exists($show{'allowedusers'})) { $colspan++;$r->print("\n"); } + if (exists($show{'uniqueperiod'})) { + $colspan++;$r->print("\n"); + } if (exists($show{'scheduled'})) { - $colspan++;$r->print("\n\n"); + $colspan++;$r->print("\n"); } + $r->print("\n"); if (exists($show{'proctor'})) { $r->print(< @@ -1225,7 +1232,7 @@ DELETELINK STUFF } } - $r->print('
$allowedusers$unique$remove_all $ids
$remove_all $ids
'); + $r->print(''); } sub upload_start {