--- loncom/interface/lontemplate.pm	2012/05/12 12:44:12	1.45.6.1
+++ loncom/interface/lontemplate.pm	2013/09/22 15:56:24	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.45.6.1 2012/05/12 12:44:12 raeburn Exp $
+# $Id: lontemplate.pm,v 1.51 2013/09/22 15:56:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,8 +115,12 @@ sub print_template {
 }
 
 sub print_start_template {
-	my ($r,$topic,$boxclass) = @_;
-	$r->print('<div class="'.$boxclass.'">');
+	my ($r,$topic,$boxclass,$id,$display) = @_;
+        my $idattrib;
+        if ($id ne '') {
+            $idattrib = ' id="'.$id.'"';
+        }
+	$r->print('<div class="'.$boxclass.'"'.$idattrib.$display.'>');
 	$r->print('<h4 class="LC_hcell">'.$topic.'</h4>');
 }
 
@@ -128,9 +132,9 @@ 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 {
@@ -146,37 +150,42 @@ sub print_saveall_template {
 }
 
 sub print_template_fields {
-	my ($r, $data_ref, $fields_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group) = @_;
+	my ($r, $data_ref, $fields_ref, $target, $allowed, $default_rich_text, $custom_handlers_ref, $group,
+            $displayref,$noshowref) = @_;
 	my @html_ids = ();
 	my %data = %{$data_ref};
 	my %fields = %{$fields_ref};
 	my %custom_handlers = %{$custom_handlers_ref};
-
+        my (%displays,%noshow);
+        if (ref($displayref) eq 'HASH') {
+            %displays = %{$displayref};
+        }
+        if (ref($noshowref) eq 'HASH') {
+            %noshow = %{$noshowref};
+        }
 	foreach my $field (sort(keys(%fields))) {
 		my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed));
+		my $legacy = 1;
+                my $display = $displays{$field};
+                unless ($allowed) {
+                    next if ($noshow{$field});
+                }
+                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);
+                    $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display);
 		} 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');
+					&Apache::lontemplate::print_start_template($r,$fields{$field},'LC_Box','box_'.$field,$display);
 					$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);
+						&print_saveall_template($r);
 						$r->print("</div>");
 					} 
 					&Apache::lontemplate::print_end_template($r);
@@ -192,6 +201,7 @@ sub print_template_fields {
 				push(@html_ids,$field);
 			}
 		}
+		undef $gateway;
 	}
 	
 	return @html_ids;