--- loncom/interface/lontemplate.pm	2008/12/10 15:58:36	1.8
+++ loncom/interface/lontemplate.pm	2008/12/17 10:57:01	1.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.8 2008/12/10 15:58:36 ehlerst Exp $
+# $Id: lontemplate.pm,v 1.11 2008/12/17 10:57:01 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,7 +58,7 @@ sub print_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,26 +70,32 @@ sub print_content_template{
               }
               $message=&Apache::lontexconvert::msgtexconverted($message);
               if ($target ne 'tex') {
-                                
-               &print_template($r,$syllabusfields{$field},$message);
-                                
-                                
-                                
+		     if($allowed){
+			$r->print('<p>');
+		     }
+		     &print_template($r,$syllabusfields{$field},$message,$allowed);
               } 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) = @_;
-	$r->print('<div class="ContentBox">');
+	my ($r,$allowed) = @_;
+	if($allowed){
+		$r->print('<div class="ContentBoxTemplate">');
+	}else{
+		$r->print('<div class="ContentBox">');
+	}
 }
 
 sub end_ContentBox{
@@ -99,16 +105,19 @@ 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>');
+	$r->print('<div>');
+	$r->print(&Apache::loncommon::messagewrapper(qq{<img name="sendMessage" src="/res/adm/pages/com.png"},$cnum,$cdom).' '.&mt('Send me a message'));
+	$r->print('</div>');
 }
 
 sub print_template
 {	
-	my ($r,$topic,$content) = @_;
-	$r->print('<div class="ContentBoxSpecial">');
+	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>');
 	$r->print('<blockquote>'.$content.'</blockquote>');
 	$r->print('</div>');
@@ -117,7 +126,7 @@ sub print_template
 sub print_editbox_template
 {
 	my ($r,$content,$field) = @_;
-	$r->print('<br /><textarea cols="53" rows="6" name="'.$field.'">'.
+	$r->print('<textarea cols="81" rows="6" name="'.$field.'">'.
                            &HTML::Entities::encode($content,'"&<>').
            '</textarea><input type="submit" name="storesyl" value="'.
                            &mt('Save All').'" />');