--- loncom/interface/lontemplate.pm	2009/02/25 13:25:52	1.20
+++ loncom/interface/lontemplate.pm	2009/12/03 02:13:28	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.20 2009/02/25 13:25:52 neumanie Exp $
+# $Id: lontemplate.pm,v 1.41 2009/12/03 02:13:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,122 +44,85 @@ use Apache::lonmsgdisplay();
 use HTML::Entities();
 
 
-sub start_columnSection{
+sub start_columnSection {
 	my ($r) = @_;
 	 $r->print('<div class="LC_columnSection">');
 }
 
-sub end_columnSection{
+sub end_columnSection {
 	my ($r) = @_;
 	 $r->print('</div>');
 }
 
-sub print_aboutme_content_template{
+sub print_aboutme_content_template {
 	my ($r,$allowed,$target,$syllabusfields_ref,$syllabus_ref) = @_;
 	my %syllabusfields = %{$syllabusfields_ref};
 	my %syllabus = %{$syllabus_ref};
-	
+
        foreach my $field (sort(keys(%syllabusfields))) {
           if (($syllabus{$field}) || ($allowed)) {
               my $message=$syllabus{$field};
-              &Apache::lonfeedback::newline_to_br(\$message);
-              $message
-             =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
+              if (!&Apache::lonfeedback::contains_block_html($message)) {
+              	&Apache::lonfeedback::newline_to_br(\$message);
+              }
+              $message=&Apache::lonhtmlcommon::raw_href_to_link($message);
               if ($allowed) {
                   $message=&Apache::lonspeller::markeduptext($message);
               }
               $message=&Apache::lontexconvert::msgtexconverted($message);
               if ($target ne 'tex') {
-		     if($allowed){
-			$r->print('<p>');
-		     }	   
-			
 		    if($field eq 'aaa_contactinfo') {
-			if($allowed){
 				$r->print('<div class="LC_Clear_AboutMe_Image" >&nbsp;</div>');
-			}
-			&print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecialContactInfo');
-			$r->print('<div class="LC_Clear_AboutMe_Image" >&nbsp;</div>');
+				&print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
+		    } else {
+			  &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box');
 		    }
- 		    else{
-			  &print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
-		    }
-		  
+			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('</p>');
-		}
-              }
           }
        }
-	
-}
-
-sub start_ContentBox{
-	my ($r,$allowed) = @_;	
-	$r->print('<div class="LC_ContentBox">');
-	
-}
 
-sub end_ContentBox{
-	my ($r) = @_;
-	$r->print('</div>');
 }
 
-sub send_message{
+sub send_message {
 	my ($r,$cnum,$cdom) = @_;
-	my $s;
-	my $image = qq{<img name="Send message" src="/res/adm/pages/com.png" border="none" />};	
-	$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{<img name="Send_message" alt="Send message symbol" src="/res/adm/pages/mail-message-new.png" border="none" align="middle" />};
+	return &Apache::loncommon::messagewrapper($image,$cnum,$cdom).' '.&Apache::loncommon::messagewrapper($linktext,$cnum,$cdom);
 }
 
-sub print_template
-{	
-	my ($r,$topic,$content, $allowed,$boxclass) = @_;	
-	$r->print('<div class="'.$boxclass.'">');	
+sub print_template {
+	my ($r,$topic,$content, $allowed,$boxclass) = @_;
+	$r->print('<div class="'.$boxclass.'">');
 	$r->print('<h4 class="LC_hcell">'.$topic.'</h4>');
-	$r->print('<p>' .$content . '</p>');
+	$r->print($content);
 	$r->print('</div>');
 }
-sub print_start_template
-{
+
+sub print_start_template {
 	my ($r,$topic,$boxclass) = @_;
-	$r->print('<div class="'.$boxclass.'">');	
+	$r->print('<div class="'.$boxclass.'">');
 	$r->print('<h4 class="LC_hcell">'.$topic.'</h4>');
 }
-sub print_end_template
-{
+
+sub print_end_template {
 	my ($r) = @_;
 	$r->print('</div>');
 }
-sub print_editbox_template
-{
+
+sub print_editbox_template {
 	my ($r,$content,$field) = @_;
 	$r->print('<textarea cols="81" rows="6" name="'.$field.'">'.
                            &HTML::Entities::encode($content,'"&<>').
            '</textarea><br /><input type="submit" name="storesyl" value="'.
                            &mt('Save All').'" />');
 }
-sub print_start_page_functions
-{
-	my($r)=@_;	
-	$r->print('<fieldset><legend>'. &mt('Functions') . '</legend>');
-}
-sub print_functions_content
-{
-	my($r,$content) = @_;
-	$r->print($content.'&nbsp');
-	
-}
-sub print_end_page_functions
-{
-	my($r)=@_;
-	$r->print('</fieldset>');
-}
+
 1;