--- loncom/interface/lontemplate.pm	2008/12/16 10:41:02	1.9
+++ loncom/interface/lontemplate.pm	2009/02/13 17:29:39	1.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.9 2008/12/16 10:41:02 ehlerst Exp $
+# $Id: lontemplate.pm,v 1.15 2009/02/13 17:29:39 neumanie Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,7 @@ use HTML::Entities();
 
 sub start_columnSection{
 	my ($r) = @_;
-	 $r->print('<div class="columnSection">');
+	 $r->print('<div class="LC_columnSection">');
 }
 
 sub end_columnSection{
@@ -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};
-	$r->print('<div class="ContentBox">');
+	#&start_ContentBox($r,$allowed);
        foreach my $field (sort(keys(%syllabusfields))) {
           if (($syllabus{$field}) || ($allowed)) {
               my $message=$syllabus{$field};
@@ -70,30 +70,40 @@ sub print_content_template{
               }
               $message=&Apache::lontexconvert::msgtexconverted($message);
               if ($target ne 'tex') {
-                                
-               &print_template($r,$syllabusfields{$field},$message);
-                                
-                                
-                                
+		     if($allowed){
+			$r->print('<p>');
+		     }	   
+			
+		    if($field eq 'aaa_contactinfo') {
+			if($allowed){
+				$r->print('<div style="clear:left;" >&nbsp;</div>');
+			}
+			&print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecialContactInfo');
+			$r->print('<div style="clear:left;" >&nbsp;</div>');
+		    }
+ 		    else{
+			  &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
+		    }
+		  
               } 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('</p>');
+		}
               }
           }
        }
-		$r->print('</div>');
+	#&end_ContentBox($r);
 }
 
 sub start_ContentBox{
-	my ($r,$allowed) = @_;
-	if($allowed){
-		$r->print('<div class="ContentBoxTemplate">');
-	}else{
-		$r->print('<div class="ContentBox">');
-	}
+	my ($r,$allowed) = @_;	
+	$r->print('<div class="LC_ContentBox">');
+	
 }
 
 sub end_ContentBox{
@@ -103,21 +113,17 @@ sub end_ContentBox{
 
 sub send_message{
 	my ($r,$cnum,$cdom) = @_;
-	$r->print('<div class="ContentBoxSpecial">');
-	$r->print('<h4 class="hcell">'.&mt('Contact').'</h4>');
-        $r->print('<blockquote>'.(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom)).'</blockquote>');
-        $r->print('</div>');
+	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>');
 }
 
 sub print_template
 {	
-	my ($r,$topic,$content, $allowed) = @_;
-	if($allowed){
-		$r->print('<div class="ContentBoxSpecialTemplate">');
-	}else{
-		$r->print('<div class="ContentBoxSpecial">');
-	}
-	$r->print('<h4 class="hcell">'.$topic.'</h4>');
+	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>');
 }
@@ -125,9 +131,9 @@ sub print_template
 sub print_editbox_template
 {
 	my ($r,$content,$field) = @_;
-	$r->print('<br /><textarea cols="80" rows="6" name="'.$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').'" />');
 }