--- loncom/interface/loncommon.pm 2006/09/19 19:03:22 1.456 +++ loncom/interface/loncommon.pm 2006/09/27 22:42:05 1.460 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.456 2006/09/19 19:03:22 albertel Exp $ +# $Id: loncommon.pm,v 1.460 2006/09/27 22:42:05 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2353,7 +2353,8 @@ sub preferred_languages { $env{'course.'.$env{'request.course.id'}.'.languages'})); } if ($env{'environment.languages'}) { - @languages=split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}); + @languages=(@languages, + split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'})); } my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0]; if ($browser) { @@ -2853,6 +2854,9 @@ Inputs: =item * $no_inline_link, if true and in remote mode, don't show the 'Switch To Inline Menu' link +=item * $args, optional argument valid values are + no_auto_mt_title -> prevents &mt()ing the title arg + =back Returns: A uniform header for LON-CAPA web pages. @@ -2864,9 +2868,9 @@ other decorations will be returned. sub bodytag { my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle, - $notopbar,$bgcolor,$notitle,$no_inline_link)=@_; + $notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_; - $title=&mt($title); + if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); } $function = &get_users_function() if (!$function); my $img = &designparm($function.'.img',$domain); @@ -3199,16 +3203,23 @@ form, .inline { display: inline; } color: red; font-size: larger; } -.LC_warning { +.LC_warning, +.LC_diff_removed { color: red; } -.LC_success { +.LC_success, +.LC_diff_added { color: green; } .LC_icon { border: 0px; } +table.LC_pastsubmission { + border: 1px solid black; + margin: 2px; +} + table#LC_top_nav, table#LC_menubuttons { width: 100%; background: $pgbg; @@ -3715,7 +3726,8 @@ Inputs: $title - optional title for the domain function -> force usage of a specific rolish color scheme bgcolor -> override the default page bgcolor - + no_auto_mt_title + -> prevent &mt()ing the title arg =back =cut @@ -3727,8 +3739,8 @@ sub headtag { my $domain = $args->{'domain'} || &determinedomain(); my $bgcolor = $args->{'bgcolor'} || &designparm($function.'.pgbg',$domain); my $url = join(':',$env{'user.name'},$env{'user.domain'}, - #time(), $Apache::lonnet::perlvar{'lonVersion'}, + #time(), $env{'environment.color.timestamp'}, $function,$domain,$bgcolor); @@ -3762,8 +3774,8 @@ ADDMETA if (!defined($title)) { $title = 'The LearningOnline Network with CAPA'; } - - $result .= '