--- loncom/interface/lonhtmlcommon.pm 2009/08/11 13:01:10 1.231 +++ loncom/interface/lonhtmlcommon.pm 2009/08/23 04:02:47 1.234 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.231 2009/08/11 13:01:10 droeschl Exp $ +# $Id: lonhtmlcommon.pm,v 1.234 2009/08/23 04:02:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -82,7 +82,7 @@ sub confirm_success { .''."\n"; } else { return ''."\n" - .''.&mt('Ok').' '."\n" + .''.&mt('OK').' '."\n" .$message."\n" .''."\n"; } @@ -160,8 +160,8 @@ sub authorbombs { $url=&Apache::lonnet::declutter($url); my ($udom,$uname)=($url=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)/}); my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); - foreach (keys %bombs) { - if ($_=~/^$udom\/$uname\//) { + foreach my $bomb (keys(%bombs)) { + if ($bomb =~ /^$udom\/$uname\//) { return ''.&mt('Bomb').''. &Apache::loncommon::help_open_topic('About_Bombs'); @@ -239,7 +239,7 @@ sub get_recent { # Begin filling return_hash with any 'always_include' option my %time_hash = (); my %return_hash = (); - foreach my $item (keys %recent) { + foreach my $item (keys(%recent)) { my ($thistime,$thisvalue)=(split(/\&/,$recent{$item})); if ($thistime eq 'always_include') { $return_hash{$item} = &unescape($thisvalue); @@ -1453,7 +1453,7 @@ returns: nothing } sub add_breadcrumb { - push (@Crumbs,@_); + push(@Crumbs,@_); } } # End of scope for @Crumbs @@ -1945,7 +1945,7 @@ sub set_form_elements { $values{$name}[$i] =~ s/([\r\n\f]+)/\\n/g; $values{$name}[$i] =~ s/"/\\"/g; } - if ($$elements{$name} eq 'text') { + if (($$elements{$name} eq 'text') || ($$elements{$name} eq 'hidden')) { my $numvalues = @{$values{$name}}; if ($numvalues > 1) { my $valuestring = join('","',@{$values{$name}}); @@ -1980,6 +1980,8 @@ sub set_form_elements { $output .= qq| if (courseForm.elements['$name'].value == "$value") { courseForm.elements['$name'].checked = true; + } else { + courseForm.elements['$name'].checked = false; }|; } } @@ -2194,7 +2196,7 @@ sub generate_menu { # create the markup for the current $link and push it into @links. # each entry consists of an image and a text optionally followed # by a help link. - push @links, $li->( + push(@links,$li->( $a->( $img->("", { class => "LC_noBorder LC_middle", @@ -2212,7 +2214,7 @@ sub generate_menu { }). (defined($$link{help}) ? Apache::loncommon::help_open_topic($$link{help}) : ''), - {class => "LC_menubuttons_inline_text"}); + {class => "LC_menubuttons_inline_text"})); } # wrap categorytitle in

, concatenate with @@ -2222,10 +2224,10 @@ sub generate_menu { # such that each element looks like: #

title

# the category won't be added if there aren't any links - push @categories, + push(@categories, $div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}). $ul->(join('' ,@links), {class =>"LC_ListStyleNormal" }), - {class=>"LC_Box LC_400Box"}) if scalar(@links); + {class=>"LC_Box LC_400Box"})) if scalar(@links); } # wrap the joined @categories in another
(column layout)