--- loncom/interface/lontemplate.pm 2009/05/30 21:52:30 1.35
+++ loncom/interface/lontemplate.pm 2009/10/16 13:47:40 1.39
@@ -1,7 +1,7 @@
# The LearningOnline Network
# "Template" Functions to generate html output
#
-# $Id: lontemplate.pm,v 1.35 2009/05/30 21:52:30 bisitz Exp $
+# $Id: lontemplate.pm,v 1.39 2009/10/16 13:47:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -70,27 +70,20 @@ sub print_aboutme_content_template {
}
$message=&Apache::lontexconvert::msgtexconverted($message);
if ($target ne 'tex') {
- if ($allowed) {
- $r->print('
');
- }
-
if($field eq 'aaa_contactinfo') {
$r->print('
');
- &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
+ &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
} else {
- &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
+ &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
}
+ if($allowed) {
+ &print_editbox_template($r,$syllabus{$field},$field);
+ }
} else {
$r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
&Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
}
- if ($allowed) {
- &print_editbox_template($r,$syllabus{$field},$field);
- if ($target ne 'tex') {
- $r->print('');
- }
- }
}
}
@@ -98,10 +91,10 @@ sub print_aboutme_content_template {
sub send_message {
my ($r,$cnum,$cdom) = @_;
- my $s;
- my $image = qq{};
- $s=&Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom);
- return $s;
+ my $linktext = &mt('Send message to [_1]',
+ &Apache::loncommon::plainname($cnum,$cdom));
+ my $image = qq{};
+ return &Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper($linktext,$cnum,$cdom);
}
sub print_template {
@@ -131,23 +124,4 @@ sub print_editbox_template {
&mt('Save All').'" />');
}
-# Functionslist: List of functions
-# Typically used to display a list of available functions at top of page
-sub start_functionslist {
- my($legendtext)=@_;
- $legendtext=&mt('Functions') if !$legendtext;
- return '';
-}
-
1;