--- loncom/interface/loncommon.pm 2006/09/12 22:13:05 1.453
+++ loncom/interface/loncommon.pm 2006/10/03 20:14:35 1.461
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.453 2006/09/12 22:13:05 albertel Exp $
+# $Id: loncommon.pm,v 1.461 2006/10/03 20:14:35 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2111,7 +2111,7 @@ sub aboutmewrapper {
return;
}
return ''.$link.'';
+ ($target?' target="$target"':'').' title="'.&mt("View this user's personal page").'">'.$link.'';
}
# ------------------------------------------------------------ Syllabus Wrapper
@@ -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;
@@ -3499,7 +3510,8 @@ table#LC_browser tr.LC_browser_file_unpu
table#LC_browser tr.LC_browser_file_obsolete {
background: #AAAAAA;
}
-table#LC_browser tr.LC_browser_file_modified {
+table#LC_browser tr.LC_browser_file_modified,
+table#LC_browser tr.LC_browser_file_metamodified {
background: #FFFF77;
}
table#LC_browser tr.LC_browser_folder {
@@ -3714,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
@@ -3726,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);
@@ -3735,9 +3748,11 @@ sub headtag {
my $result =
''.
- &font_settings().
- &Apache::lonhtmlcommon::htmlareaheaders();
+ &font_settings();
+ if (!$args->{'frameset'}) {
+ $result .= &Apache::lonhtmlcommon::htmlareaheaders();
+ }
if ($args->{'force_register'}) {
$result .= &Apache::lonmenu::registerurl(1);
}
@@ -3761,8 +3776,8 @@ ADDMETA
if (!defined($title)) {
$title = 'The LearningOnline Network with CAPA';
}
-
- $result .= ' LON-CAPA '.&mt($title).''
+ if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
+ $result .= ' LON-CAPA '.$title.''
.''
.$head_extra;
return $result;
@@ -3906,6 +3921,8 @@ Inputs: $title - optional title for the
no_inline_link -> if true and in remote mode, don't show the
'Switch To Inline Menu' link
+ no_auto_mt_title -> prevent &mt()ing the title arg
+
=back
=cut
@@ -3915,7 +3932,8 @@ sub start_page {
#&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
my %head_args;
foreach my $arg ('redirect','force_register','domain','function',
- 'bgcolor','frameset','no_nav_bar','only_body') {
+ 'bgcolor','frameset','no_nav_bar','only_body',
+ 'no_auto_mt_title') {
if (defined($args->{$arg})) {
$head_args{$arg} = $args->{$arg};
}
@@ -3941,7 +3959,8 @@ sub start_page {
$args->{'only_body'}, $args->{'domain'},
$args->{'force_register'}, $args->{'body_title'},
$args->{'no_nav_bar'}, $args->{'bgcolor'},
- $args->{'no_title'}, $args->{'no_inline_link'});
+ $args->{'no_title'}, $args->{'no_inline_link'},
+ $args);
}
}
@@ -5950,15 +5969,6 @@ sub lonhttpdurl {
return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
}
-sub absolute_url {
- my ($host_name) = @_;
- my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://');
- if ($host_name eq '') {
- $host_name = $ENV{'SERVER_NAME'};
- }
- return $protocol.$host_name;
-}
-
sub connection_aborted {
my ($r)=@_;
$r->print(" ");$r->rflush();