--- loncom/interface/lontemplate.pm	2009/10/16 13:47:40	1.39
+++ loncom/interface/lontemplate.pm	2012/12/18 15:53:07	1.45.6.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.39 2009/10/16 13:47:40 raeburn Exp $
+# $Id: lontemplate.pm,v 1.45.6.3 2012/12/18 15:53:07 raeburn 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;
@@ -43,6 +43,13 @@ use Apache::lonlocal;
 use Apache::lonmsgdisplay();
 use HTML::Entities();
 
+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) = @_;
@@ -62,9 +69,10 @@ sub print_aboutme_content_template {
        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);
               }
@@ -119,9 +127,73 @@ sub print_end_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').'" />');
+                  &HTML::Entities::encode($content,'"&<>').
+                  '</textarea><br />'."\n");
+	&print_saveall_template($r);
+}
+
+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));
+                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 (!&Apache::lonfeedback::contains_block_html($message)) {
+                                        &Apache::lonfeedback::newline_to_br(\$message);
+                                } else {
+                                        $message = &Apache::lonfeedback::tidy_html($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') {
+					#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);
+						&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);
+			}
+		}
+	}
+	
+	return @html_ids;	
 }
 
 1;