--- loncom/interface/loncommon.pm 2009/03/04 12:43:31 1.762
+++ loncom/interface/loncommon.pm 2009/03/08 21:49:33 1.764
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.762 2009/03/04 12:43:31 bisitz Exp $
+# $Id: loncommon.pm,v 1.764 2009/03/08 21:49:33 weissno Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -924,16 +924,22 @@ sub help_open_topic {
# Add the text
if ($text ne "") {
- $template.="$text";
+ $template.=''
+ .''
+ .$text.'';
}
- # Add the graphic
+ # (Always) Add the graphic
my $title = &mt('Online Help');
my $helpicon=&lonhttpdurl("/adm/help/help.png");
- $template .= <<"ENDTEMPLATE";
-
-ENDTEMPLATE
-
+ $template.=' '
+ .'
';
+ if ($text ne "") {
+ $template.='';
+ }
return $template;
}
@@ -945,25 +951,26 @@ sub helpLatexCheatsheet {
my $out;
my $addOther = '';
if ($topic) {
- $addOther = &Apache::loncommon::help_open_topic($topic,$text,
- undef, undef, 600).
- '
'. - $addOther . - &Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'), - undef,undef,600). - ' | '. - &Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'), - undef,undef,600). - ' | '; + $addOther = ''.&Apache::loncommon::help_open_topic($topic,&mt($text), + undef, undef, 600). + ' '; + } + $out = '' # Start cheatsheet + .$addOther + .'' + .&Apache::loncommon::help_open_topic('Greek_Symbols',&mt('Greek Symbols'), + undef,undef,600) + .' ' + .&Apache::loncommon::help_open_topic('Other_Symbols',&mt('Other Symbols'), + undef,undef,600) + .''; unless ($not_author) { - $out .= ''. - &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'), - undef,undef,600). - ' | '; + $out .= ' ' + .&Apache::loncommon::help_open_topic('Authoring_Output_Tags',&mt('Output Tags'), + undef,undef,600) + .''; } - $out .= '