--- loncom/interface/loncommon.pm 2009/10/28 17:24:32 1.692.2.13 +++ loncom/interface/loncommon.pm 2009/01/30 12:47:54 1.739 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.692.2.13 2009/10/28 17:24:32 raeburn Exp $ +# $Id: loncommon.pm,v 1.739 2009/01/30 12:47:54 ehlerst Exp $ # # Copyright Michigan State University Board of Trustees # @@ -271,7 +271,7 @@ BEGIN { } } &Apache::lonnet::logthis( - "INFO: Read file types"); + "INFO: Read file types"); $readit=1; } # end of unless($readit) @@ -926,7 +926,7 @@ sub help_open_topic { if ($text ne "") { $template .= "". - "
$text"; + "$text"; } # Add the graphic @@ -935,7 +935,7 @@ sub help_open_topic { $template .= <<"ENDTEMPLATE"; (Help: $topic) ENDTEMPLATE - if ($text ne '') { $template.='
' }; + if ($text ne '') { $template.='' }; return $template; } @@ -947,12 +947,12 @@ sub helpLatexCheatsheet { my $out; my $addOther = ''; if ($topic) { - $addOther = Apache::loncommon::help_open_topic($topic,$text, + $addOther = &Apache::loncommon::help_open_topic($topic,$text, undef, undef, 600). - ''; + ''; } $out = '
'. - $addOther. + $addOther . &Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'), undef,undef,600). ''. @@ -1134,7 +1134,7 @@ sub help_open_bug { { $template .= "". - "
$text"; + "$text"; } # Add the graphic @@ -1179,7 +1179,7 @@ sub help_open_faq { { $template .= "". - "'."\n";; } @@ -7392,9 +7712,9 @@ sub upload_embedded { ' '. $orig_uploaded_filename.'
'; } else { - $output .= ''. + $output .= ''. &mt('View embedded file: [_1]',''. - $orig_uploaded_filename.'').'
'; + $orig_uploaded_filename.'').'
'; } } close($fh); @@ -7653,7 +7973,7 @@ sub upfile_select_html { # xml => &mt('HTML/XML'), ); my $Str = ''. - '
Type: '; foreach my $type (sort(keys(%Types))) { $Str .= '\n"; } @@ -9554,8 +9874,8 @@ sub init_user_environment { } untie(%disk_env); } else { - &Apache::lonnet::logthis("WARNING: ". - 'Could not create environment storage in lonauth: '.$!.''); + &Apache::lonnet::logthis("WARNING: ". + 'Could not create environment storage in lonauth: '.$!.''); return 'error: '.$!; } }
$text"; + "$text"; } # Add the graphic @@ -1635,7 +1635,7 @@ sub multiple_select_form { $size = scalar(keys(%$hash)); } } - $output.="\n'; my @order; if (ref($order) eq 'ARRAY') { @order = @{$order}; @@ -1692,17 +1692,17 @@ sub select_form { sub display_filter { if (!$env{'form.show'}) { $env{'form.show'}=10; } if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; } - return ' '. + ' '. &mt('Filter [_1]', &select_form($env{'form.displayfilter'}, 'displayfilter', ('currentfolder' => 'Current folder/page', 'containing' => 'Containing phrase', 'none' => 'None'))). - ''; + ''; } sub gradeleveldescription { @@ -1746,7 +1746,7 @@ sub select_level_form { =pod -=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$change) +=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc) Returns a string containing a \n"; + my $selectdomain = "