--- loncom/interface/lontemplate.pm	2008/12/22 14:24:50	1.14
+++ loncom/interface/lontemplate.pm	2009/05/07 11:12:47	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.14 2008/12/22 14:24:50 ehlerst Exp $
+# $Id: lontemplate.pm,v 1.32 2009/05/07 11:12:47 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,11 +54,11 @@ sub end_columnSection{
 	 $r->print('</div>');
 }
 
-sub print_content_template{
+sub print_aboutme_content_template{
 	my ($r,$allowed,$target,$syllabusfields_ref,$syllabus_ref) = @_;
 	my %syllabusfields = %{$syllabusfields_ref};
 	my %syllabus = %{$syllabus_ref};
-	&start_ContentBox($r,$allowed);
+
        foreach my $field (sort(keys(%syllabusfields))) {
           if (($syllabus{$field}) || ($allowed)) {
               my $message=$syllabus{$field};
@@ -73,7 +73,15 @@ sub print_content_template{
 		     if($allowed){
 			$r->print('<p>');
 		     }
-		     &print_template($r,$syllabusfields{$field},$message,$allowed);
+
+		    if($field eq 'aaa_contactinfo') {
+				$r->print('<div class="LC_Clear_AboutMe_Image" >&nbsp;</div>');
+				&print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
+		    }
+ 		    else{
+			  &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
+		    }
+
               } else {
                      $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
                                &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -86,16 +94,13 @@ sub print_content_template{
               }
           }
        }
-	&end_ContentBox($r);
+
 }
 
 sub start_ContentBox{
 	my ($r,$allowed) = @_;
-	if($allowed){
-		$r->print('<div class="ContentBoxTemplate">');
-	}else{
-		$r->print('<div class="LC_ContentBox">');
-	}
+	$r->print('<div class="LC_ContentBox">');
+
 }
 
 sub end_ContentBox{
@@ -105,32 +110,59 @@ sub end_ContentBox{
 
 sub send_message{
 	my ($r,$cnum,$cdom) = @_;
-	my $image = qq{<img name="Send message" src="/res/adm/pages/com.png" border="none" />};
-	$r->print('<div>');
-	$r->print(&Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom));
-	$r->print('</div>');
+	my $s;
+	my $image = qq{<img name="Send message" src="/res/adm/pages/mail-message-new.png" border="none" align="middle" />};
+	$s=&Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom);
+	return $s;
 }
 
 sub print_template
-{	
-	my ($r,$topic,$content, $allowed) = @_;
-	if($allowed){
-		$r->print('<div class="ContentBoxSpecialTemplate">');
-	}else{
-		$r->print('<div class="LC_ContentBoxSpecial">');
-	}
+{
+	my ($r,$topic,$content, $allowed,$boxclass) = @_;
+	$r->print('<div class="'.$boxclass.'">');
 	$r->print('<h4 class="LC_hcell">'.$topic.'</h4>');
-	$r->print('<blockquote>'.$content.'</blockquote>');
+	$r->print('<div class="LC_BoxPadding">' .$content . '</div>');
+	$r->print('</div>');
+}
+sub print_start_template
+{
+	my ($r,$topic,$boxclass) = @_;
+	$r->print('<div class="'.$boxclass.'">');
+	$r->print('<h4 class="LC_hcell">'.$topic.'</h4>');
+	$r->print('<div class="LC_BoxPadding">' );
+}
+sub print_end_template
+{
+	my ($r) = @_;
+	$r->print('</div>');
 	$r->print('</div>');
 }
-
 sub print_editbox_template
 {
 	my ($r,$content,$field) = @_;
 	$r->print('<textarea cols="81" rows="6" name="'.$field.'">'.
                            &HTML::Entities::encode($content,'"&<>').
-           '</textarea><input type="submit" name="storesyl" value="'.
+           '</textarea><br /><input type="submit" name="storesyl" value="'.
                            &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 '<fieldset><legend>'.$legendtext.'</legend>'
+          .'<ul class="LC_functionslist">';
+}
+
+sub item_functionslist {
+    my($content) = @_;
+    return '<li>'.$content.'</li>';
+}
+
+sub end_functionslist {
+    my($r)=@_;
+    return '</ul></fieldset>';
+}
+
 1;