--- loncom/interface/lontemplate.pm	2008/12/02 23:41:00	1.6
+++ loncom/interface/lontemplate.pm	2011/05/03 21:38:40	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.6 2008/12/02 23:41:00 harmsja Exp $
+# $Id: lontemplate.pm,v 1.45 2011/05/03 21:38:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,11 +26,11 @@
 # http://www.lon-capa.org/
 #
 
-
 package Apache::lontemplate;
 
 
 use strict;
+use utf8;
 use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::lonnet;
@@ -40,59 +40,156 @@ use Apache::lontexconvert;
 use Apache::lonfeedback;
 use Apache::lonrss();
 use Apache::lonlocal;
+use Apache::lonhtmlgateway;
 use Apache::lonmsgdisplay();
 use HTML::Entities();
 
-sub print_content_template{
+use constant {
+	RICH_TEXT_ALWAYS_ON => 'LC_richAlwaysOn',
+	RICH_TEXT_ALWAYS_OFF => 'LC_richAlwaysOff',
+	RICH_TEXT_DEFAULT_ON => 'LC_richDefaultOn',
+	RICH_TEXT_DETECT_HTML => 'LC_richDetectHtml',
+	RICH_TEXT_DEFAULT_OFF => 'LC_richDefaultOff'
+};
+
+sub start_columnSection {
+	my ($r) = @_;
+	 $r->print('<div class="LC_columnSection">');
+}
+
+sub end_columnSection {
+	my ($r) = @_;
+	 $r->print('</div>');
+}
+
+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="columnSection">');       
+
        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') {
-                                
-               &print_template($r,$syllabusfields{$field},$message);
-                                
-                                
-                                
+		    if($field eq 'aaa_contactinfo') {
+				$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');
+		    }
+			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);
-              }
           }
        }
-        $r->print('</div>');
+
 }
 
-sub print_template
-{	
-	my ($r,$topic,$content) = @_;
-	$r->print('<div class="ContentBoxSpecial">');
-	$r->print('<h4 class="hcell">'.$topic.'</h4>');
-	$r->print('<blockquote>'.$content.'</blockquote>');
+sub send_message {
+	my ($r,$cnum,$cdom) = @_;
+	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.'">');
+	$r->print('<h4 class="LC_hcell">'.$topic.'</h4>');
+	$r->print($content);
+	$r->print('</div>');
+}
+
+sub print_start_template {
+	my ($r,$topic,$boxclass) = @_;
+	$r->print('<div class="'.$boxclass.'">');
+	$r->print('<h4 class="LC_hcell">'.$topic.'</h4>');
+}
+
+sub print_end_template {
+	my ($r) = @_;
 	$r->print('</div>');
 }
 
-sub print_editbox_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').'" />');
+}
+
+sub print_textarea_template {
+	my ($r, $content, $field, $wysiwyg) = @_;
+	$r->print('<textarea cols="81" rows="6" class="'.$wysiwyg.'" id="'.$field.'" name="'.$field.'">'.
+						  &HTML::Entities::encode($content, '"&<>').
+			'</textarea><br />');
+}
+
+sub print_saveall_template {
+	my ($r) = @_;
+	$r->print('<input type="submit" name="storesyl" value="'.&mt('Save All').'" />');
+}
 
+sub print_template_fields {
+	my ($r, $data_ref, $fields_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group) = @_;
+	my @html_ids = ();
+	my %data = %{$data_ref};
+	my %fields = %{$fields_ref};
+	my %custom_handlers = %{$custom_handlers_ref};
+
+	foreach my $field (sort(keys(%fields))) {
+		my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed));
+		my $legacy = 1;
+		my $gateway = Apache::lonhtmlgateway->new($target);
+        $message = &Encode::decode('utf8', $message);		
+        $message = $gateway->process_outgoing_html($message, $legacy);
+        if ((%custom_handlers) && ($custom_handlers{$field})) {
+			$custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed);
+		} else {
+			if (($data{$field}=~/\w/) || ($allowed)) {
+				if ($target ne 'tex') {
+					#output of syllabusfields will be generated here. 
+					&Apache::lontemplate::print_start_template($r,$fields{$field},'LC_Box');
+					$r->print($message);
+					if ($allowed) {
+						$r->print("<br /><div>");
+						&Apache::lontemplate::print_textarea_template($r, $data{$field},
+							$field, $default_rich_text);
+						&Apache::lontemplate::print_saveall_template($r);
+						$r->print("</div>");
+					} 
+					&Apache::lontemplate::print_end_template($r);
+				} else {
+				    my $safeinit;
+                                    if ($fields{$field}=~/\w/) {
+                                       $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$fields{$field}.'</h3>'));
+                                    } else {
+                                       $r->print(&Apache::lonxml::xmlparse($r,'tex','<br />'));
+                                    }
+                                    $r->print(&Apache::lonxml::xmlparse($r,'tex',$message));
+				}
+				push(@html_ids,$field);
+			}
+		}
+		undef $gateway;
+	}
+	
+	return @html_ids;	
 }
 
 1;