--- loncom/interface/loncommon.pm 2009/03/01 20:24:39 1.760 +++ loncom/interface/loncommon.pm 2009/03/04 17:07:31 1.763 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.760 2009/03/01 20:24:39 harmsja Exp $ +# $Id: loncommon.pm,v 1.763 2009/03/04 17:07:31 bisitz 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"; - (Help: $topic) -ENDTEMPLATE - + $template.=' ' + .''.&mt('Help: [_1]',$topic).''; + 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). - ''; - } - $out = ''; + $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 .= ''; + $out .= ' ' + .&Apache::loncommon::help_open_topic('Authoring_Output_Tags',&mt('Output Tags'), + undef,undef,600) + .''; } - $out .= '
'. - $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). - ''. - &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'), - undef,undef,600). - '
'; + $out .= ''; # End cheatsheet return $out; } @@ -4244,7 +4251,7 @@ $realm  ENDROLE - my $titleinfo = ''.$title.''; + my $titleinfo = '

'.$title.'

'; if ($customtitle) { $titleinfo = $customtitle; } @@ -4611,9 +4618,6 @@ table#LC_title_bar td.LC_title_bar_who { span.LC_metadata { font-family: $sans; } -span.LC_title_bar_title { - font: bold x-large $sans; -} table#LC_title_bar td.LC_title_bar_domain_logo { background: $sidebg; text-align: right; @@ -5581,6 +5585,12 @@ h2,h3,h4,h5,h6 overflow:hidden; } +.LC_Right { + float: right; + margin: 0px; + padding: 0px; +} + p, .LC_ContentBox { padding: 10px; @@ -5591,13 +5601,14 @@ p, .LC_ContentBox { cursor:pointer; text-decoration:underline; } -.LC_helptextbgcolor -{ - background-color:#5555FF; -} -.LC_helptextfontcolor -{ - color:#FFFFFF; + +.LC_help_open_topic { + color: #FFFFFF; + background-color: #EEEEFF; + margin: 1px; + padding: 4px; + border: 1px solid #000033; + white-space: nowrap; } dl,ul,div,fieldset { @@ -5667,10 +5678,12 @@ ul.LC_TabContent li a, ul.LC_TabContent text-decoration:none; font-size:95%; font-weight:bold; + padding-right: 16px; } ul.LC_TabContent li:hover, ul.LC_TabContent li.active{ - background-color:#FFFFFF; + background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center; border-bottom:solid 1px #FFFFFF; + padding-right: 16px; } ul.LC_TabContentBigger li{ vertical-align:bottom;