version 1.473, 2011/12/20 22:41:31
|
version 1.475, 2011/12/21 20:21:49
|
Line 632 sub getDescription {
|
Line 632 sub getDescription {
|
return &mt('Reserved - next open [_1]', |
return &mt('Reserved - next open [_1]', |
timeToHumanString($slot_time,'start')); |
timeToHumanString($slot_time,'start')); |
} elsif ($slot_status == $res->RESERVABLE) { |
} elsif ($slot_status == $res->RESERVABLE) { |
return &mt('Reservable ending [_1]', |
return &mt('Reservable, reservations close [_1]', |
timeToHumanString($slot_time,'end')); |
timeToHumanString($slot_time,'end')); |
} elsif ($slot_status == $res->RESERVABLE_LATER) { |
} elsif ($slot_status == $res->RESERVABLE_LATER) { |
return &mt('Reservable starting [_1]', |
return &mt('Reservable, reservations open [_1]', |
timeToHumanString($slot_time,'start')); |
timeToHumanString($slot_time,'start')); |
} elsif ($slot_status == $res->NOT_IN_A_SLOT) { |
} elsif ($slot_status == $res->NOT_IN_A_SLOT) { |
return &mt('Reserve a time/place to work'); |
return &mt('Reserve a time/place to work'); |
Line 1503 END
|
Line 1503 END
|
} |
} |
} |
} |
$result.='</form>'; |
$result.='</form>'; |
|
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
if ($env{'course.'.$env{'request.course.id'}.'.url'} eq |
|
"uploaded/$cdom/$cnum/default.sequence") { |
|
&add_linkitem($args->{'linkitems'},'edittoplevel', |
|
"javascript:gocmd('/adm/coursedocs','direct');", |
|
'Content Editor'); |
|
} |
|
} |
} |
} |
|
|
if ($args->{'caller'} eq 'navmapsdisplay') { |
if ($args->{'caller'} eq 'navmapsdisplay') { |
Line 1855 sub add_linkitem {
|
Line 1865 sub add_linkitem {
|
sub show_linkitems_toolbar { |
sub show_linkitems_toolbar { |
my ($linkitems,$condition)=@_; |
my ($linkitems,$condition)=@_; |
my @linkorder = ('firsthomework','everything','uncompleted', |
my @linkorder = ('firsthomework','everything','uncompleted', |
'changefolder','clearbubbles'); |
'changefolder','clearbubbles','edittoplevel'); |
my $result .='<td align="left">'."\n". |
my $result .='<td align="left">'."\n". |
'<span class="LC_nobreak">'."\n". |
'<span class="LC_nobreak">'."\n". |
'<ul id="LC_toolbar">'; |
'<ul id="LC_toolbar">'; |
Line 5115 sub check_for_slot {
|
Line 5125 sub check_for_slot {
|
my $start = $slots{$slot_name}->{'starttime'}; |
my $start = $slots{$slot_name}->{'starttime'}; |
my $ip = $slots{$slot_name}->{'ip'}; |
my $ip = $slots{$slot_name}->{'ip'}; |
if ($self->simpleStatus() == OPEN) { |
if ($self->simpleStatus() == OPEN) { |
my @proctors; |
|
if ($slots{$slot_name}->{'proctor'} ne '') { |
|
@proctors = split(',',$slots{$slot_name}->{'proctor'}); |
|
} |
|
if ($end > $now) { |
if ($end > $now) { |
if ($start > $now) { |
if ($start > $now) { |
return (RESERVED_LATER,$start,$slot_name); |
return (RESERVED_LATER,$start,$slot_name); |
Line 5172 sub check_for_slot {
|
Line 5178 sub check_for_slot {
|
$env{'user.domain'}); |
$env{'user.domain'}); |
if (ref($reservable) eq 'HASH') { |
if (ref($reservable) eq 'HASH') { |
if ((ref($reservable->{'now_order'}) eq 'ARRAY') && (ref($reservable->{'now'}) eq 'HASH')) { |
if ((ref($reservable->{'now_order'}) eq 'ARRAY') && (ref($reservable->{'now'}) eq 'HASH')) { |
foreach my $slot (@{$reservable->{'now_order'}}) { |
foreach my $slot (reverse (@{$reservable->{'now_order'}})) { |
if (($reservable->{'now'}{$slot}{'symb'} eq '') || |
if (($reservable->{'now'}{$slot}{'symb'} eq '') || |
($reservable->{'now'}{$slot}{'symb'} eq $symb)) { |
($reservable->{'now'}{$slot}{'symb'} eq $symb)) { |
return(RESERVABLE,$reservable->{'now'}{$slot}{'endreserve'}); |
return(RESERVABLE,$reservable->{'now'}{$slot}{'endreserve'}); |
Line 5180 sub check_for_slot {
|
Line 5186 sub check_for_slot {
|
} |
} |
} |
} |
if ((ref($reservable->{'future_order'}) eq 'ARRAY') && (ref($reservable->{'future'}) eq 'HASH')) { |
if ((ref($reservable->{'future_order'}) eq 'ARRAY') && (ref($reservable->{'future'}) eq 'HASH')) { |
foreach my $slot (reverse (@{$reservable->{'future_order'}})) { |
foreach my $slot (@{$reservable->{'future_order'}}) { |
if (($reservable->{'future'}{$slot}{'symb'} eq '') || |
if (($reservable->{'future'}{$slot}{'symb'} eq '') || |
($reservable->{'future'}{$slot}{'symb'} eq $symb)) { |
($reservable->{'future'}{$slot}{'symb'} eq $symb)) { |
return(RESERVABLE_LATER,$reservable->{'future'}{$slot}{'startreserve'}); |
return(RESERVABLE_LATER,$reservable->{'future'}{$slot}{'startreserve'}); |