--- loncom/interface/lonhelper.pm 2011/11/07 18:22:03 1.187 +++ loncom/interface/lonhelper.pm 2015/08/14 15:34:01 1.194 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # .helper XML handler to implement the LON-CAPA helper # -# $Id: lonhelper.pm,v 1.187 2011/11/07 18:22:03 raeburn Exp $ +# $Id: lonhelper.pm,v 1.194 2015/08/14 15:34:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -651,7 +651,7 @@ sub display { $result .= $buttons; - #foreach my $key (keys %{$self->{VARS}}) { + #foreach my $key (keys(%{$self->{VARS}})) { # $result .= "|$key| -> " . $self->{VARS}->{$key} . "
"; #} @@ -1913,7 +1913,13 @@ CHECK if ($anytime) { $result.=' checked="checked" ' } - $result.="name='${var}anytime'/>".&mt('Any time').'' + my $anytimetext = &mt('Any time'); + if (($var eq 'startreserve') || ($var eq 'endreserve')) { + $anytimetext = &mt('Any time before slot starts'); + } elsif (($var eq 'startunique') || ($var eq 'endunique')) { + $anytimetext = &mt('No restriction on uniqueness'); + } + $result.="name='${var}anytime'/>".$anytimetext.'' } return $result; @@ -2390,7 +2396,7 @@ BUTTONS $result .= "$text"; } } - $result .= "Select"; + $result .= ''.&Apache::lonlocal::mt('Select').''; $result .= ""; # Close off the extra row and start a new one. $headings_done = 1; } @@ -2487,9 +2493,9 @@ BUTTONS &HTML::Entities::encode(&$valueFunc($resource),"<>&\"'"); if ($addparts && (scalar(@{$resource->parts}) > 1)) { $col .= ""; } @@ -2534,7 +2540,8 @@ RADIO 'closeAllPages' => $self->{'closeallpages'}, 'suppressEmptySequences' => $self->{'suppressEmptySequences'}, 'include_top_level_map' => $self->{'include_top_level_map'}, - 'iterator_map' => $mapUrl } + 'iterator_map' => $mapUrl, + 'map_no_edit_link' => 1, } ); $result .= $buttons; @@ -2982,7 +2989,7 @@ BUTTONS $subdir=$londocroot.$subdir; } my ($user,$domain)= - &Apache::loncacc::constructaccess($subdir); + &Apache::lonnet::constructaccess($subdir); $metadir='/res/'.$domain.'/'.$user.'/'.$innerpath; ($listref,$listerror) = &Apache::lonnet::dirlist($subdir,$domain,$user,undef,undef,'/'); @@ -3627,7 +3634,7 @@ sub render { my @results; # Collect all the results - for my $stateName (keys %{$helper->{STATES}}) { + for my $stateName (keys(%{$helper->{STATES}})) { my $state = $helper->{STATES}->{$stateName}; for my $element (@{$state->{ELEMENTS}}) {