--- loncom/interface/lonhtmlcommon.pm 2005/10/04 19:59:15 1.112 +++ loncom/interface/lonhtmlcommon.pm 2005/10/13 18:31:06 1.113 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.112 2005/10/04 19:59:15 raeburn Exp $ +# $Id: lonhtmlcommon.pm,v 1.113 2005/10/13 18:31:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1246,7 +1246,7 @@ returns: nothing # # In general a &submit_row() call should proceed the call to &end_pick_box(), # as this routine adds a button for form submission. -# &submit_row(0 does not require a &row_closure after it. +# &submit_row() does not require a &row_closure after it. # # &start_pick_box() creates a bounding table with 1-pixel wide black border. # rows should be placed between calls to &start_pick_box() and &end_pick_box. @@ -1317,7 +1317,7 @@ ENDONE } sub row_closure { - my $output .= <<"ENDTWO"; + my $output = <<"ENDTWO"; @@ -1336,9 +1336,9 @@ sub role_select_row { my $output = &row_title($col_width,$tablecolor,$title); $output .= qq| \n|; @@ -1381,13 +1381,13 @@ sub course_select_row { my @items = (); my @longitems = (); if ($$idlist{$$codetitles[0]} =~ /","/) { - @items = split/","/,$$idlist{$$codetitles[0]}; + @items = split(/","/,$$idlist{$$codetitles[0]}); } else { $items[0] = $$idlist{$$codetitles[0]}; } if (defined($$idlist_titles{$$codetitles[0]})) { if ($$idlist_titles{$$codetitles[0]} =~ /","/) { - @longitems = split/","/,$$idlist_titles{$$codetitles[0]}; + @longitems = split(/","/,$$idlist_titles{$$codetitles[0]}); } else { $longitems[0] = $$idlist_titles{$$codetitles[0]}; } @@ -1424,7 +1424,7 @@ sub status_select_row { my $output = &row_title($col_width,$tablecolor,$title); $output .= qq| @@ -1437,13 +1437,13 @@ sub email_default_row { my ($authtypes,$col_width,$tablecolor,$title,$descrip) = @_; my $output = &row_title($col_width,$tablecolor,$title); my @rowcols = ('#eeeeee','#dddddd'); - $output .= ' '.$descrip.' - - - + $output .= ' + '."\n"; my $rownum = 0; - foreach my $auth (sort keys (%{$authtypes})) { + foreach my $auth (sort(keys(%{$authtypes}))) { my ($userentry,$size); my $rowiter = $rownum%2; if ($auth =~ /^krb/) { @@ -1453,11 +1453,11 @@ sub email_default_row { $userentry = 'username@'; $size = 15; } - $output .= ''; + $output .= ''; $rownum ++; } - $output .= "
'.&mt('Authentication Method').'      '.&mt('Username -> e-mail conversion').''.$descrip; + $output .= &start_pick_box('50%'); + $output .= '
'.&mt('Authentication Method').''.&mt('Username -> e-mail conversion').'
'.$$authtypes{$auth}.'   '.$userentry.'
'.$$authtypes{$auth}.''.$userentry.'
- \n"; + $output .= &end_pick_box(); + $output .= "
\n"; $output .= &row_closure(); return $output; } @@ -1465,7 +1465,7 @@ sub email_default_row { sub submit_row { my ($col_width,$tablecolor,$title,$cmd,$submit_text) = @_; - my $output .= &row_title($col_width,$tablecolor,$title); + my $output = &row_title($col_width,$tablecolor,$title); $output .= qq|