--- loncom/interface/lonsyllabus.pm	2009/09/26 20:07:58	1.98
+++ loncom/interface/lonsyllabus.pm	2010/01/28 17:22:34	1.105
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.98 2009/09/26 20:07:58 amueller Exp $
+# $Id: lonsyllabus.pm,v 1.105 2010/01/28 17:22:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -151,7 +151,7 @@ ENDSCRIPT
             &Apache::lonhtmlcommon::clear_breadcrumbs();
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"javascript:ToCatalog()",
-                text=>"Course Catalog"});
+                text=>"Course/Community Catalog"});
             if ($env{'form.coursenum'} ne '') {
                 &Apache::lonhtmlcommon::add_breadcrumb
                     ({href=>"javascript:ToCatalog('details')",
@@ -238,7 +238,7 @@ ENDSCRIPT
 			#if you have the register flag, keep it
 			if($env{'form.register'} == 1) {
             	$functions.=&Apache::lonhtmlcommon::add_item_funclist(
-                          '<a href="'.$r->uri.'?forcestudent=1&register=1">'
+                          '<a href="'.$r->uri.'?forcestudent=1&amp;register=1">'
                            .&mt('Show Public View').'</a>'
                            .&Apache::loncommon::help_open_topic(
                                 'Uploaded_Templates_PublicView'));
@@ -252,7 +252,7 @@ ENDSCRIPT
         } elsif ($privileged) {
 			if($env{'form.register'} == 1) {
 	            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
-                           '<a href="'.$r->uri.'?forceedit=1&register=1">'
+                           '<a href="'.$r->uri.'?forceedit=1&amp;register=1">'
                             .&mt('Edit').'</a>');
 			} else {
 	            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
@@ -276,7 +276,7 @@ ENDSCRIPT
                  .'</p>'
                  .'<p class="LC_info">'
                  .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].'
-                     ,'<a href="/adm/courseprefs?actions=courseinfo&phase=display">','</a>')
+                     ,'<a href="/adm/courseprefs?actions=courseinfo&amp;phase=display">','</a>')
                  .'</p>'
         );
         #-Print Help Text
@@ -409,32 +409,50 @@ ENDSCRIPT
                         }
                     }
                     if ($allowed) {
-                        $r->print('<h3>'.$syllabusfields{$field}.
-                        &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>');
+                         &Apache::lonfeedback::newline_to_br(\$urls);
+                         &Apache::lontemplate::print_start_template($r,$syllabusfields{$field}.
+                         		  &Apache::loncommon::help_open_topic('Syllabus_URLs'),'LC_Box');
+                         $r->print($urls);
+                         $r->print("<br /><div>");
+						 &Apache::lontemplate::print_textarea_template($r, $syllabus{$field},
+						 	$field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF);
+						 &Apache::lontemplate::print_saveall_template($r);                         
+						 $r->print("</div>");
+						 &Apache::lontemplate::print_end_template($r);
+
                     } else {
                         $r->print($message);
                     }
                 } else {
-                    &Apache::lonfeedback::newline_to_br(\$message);
-                    $message =~s|(https?\://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
+                    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_template($r, $syllabusfields{$field}, $message,$allowed,'LC_Box');
+						&Apache::lontemplate::print_start_template($r,$syllabusfields{$field},'LC_Box');
+                        $r->print($message);
+                        if ($allowed) {
+                            $r->print("<br /><div>");
+                            &Apache::lontemplate::print_textarea_template($r, $syllabus{$field},
+                            	$field, Apache::lontemplate->RICH_TEXT_DETECT_HTML);
+                            &Apache::lontemplate::print_saveall_template($r);
+							$r->print("</div>");
+						} 
+                    	&Apache::lontemplate::print_end_template($r);
                     } else {
                         $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
                         &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
                     }
                     push(@htmlids,$field);
                 }
-                if ($allowed) {
-                    if ($target ne 'tex') {
-                        &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
-                    }
-                }
             }
         }
         if ($allowed) {