--- loncom/interface/lonsyllabus.pm	2009/09/02 12:39:26	1.94
+++ loncom/interface/lonsyllabus.pm	2009/12/22 06:31:02	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.94 2009/09/02 12:39:26 droeschl Exp $
+# $Id: lonsyllabus.pm,v 1.104 2009/12/22 06:31:02 faziophi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -141,7 +141,7 @@ ENDSCRIPT
         }
         my $start_page =
          &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
-                       {'function'       => $forcestudent,
+                       {'function'       => undef,
                         'domain'         => $cdom,
                         'force_register' =>
                         $env{'form.register'},});
@@ -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')",
@@ -182,6 +182,7 @@ ENDSCRIPT
             }
             if ($forcestudent or $target eq 'tex') { $allowed=0; }
         }
+		#store what the user typed in
         if (($allowed) && ($env{'form.storesyl'})) {
             foreach my $syl_field (keys(%syllabusfields)) {
                 my $field=$env{'form.'.$syl_field};
@@ -190,6 +191,7 @@ ENDSCRIPT
                 $field=~s/^\s+//s;
                 $field=~s/\<br\s*\/*\>$//s;
                 $field=&Apache::lonfeedback::clear_out_html($field,1);
+				#here it will be stored
                 $syllabus{$syl_field}=$field;
                 if ($syl_field eq 'lll_includeurl') { # clean up included URLs
                     my $field='';
@@ -232,17 +234,31 @@ ENDSCRIPT
 #--------Functions
     if( ($allowed || $privileged) && $target ne 'tex') {
         my $functions=&Apache::lonhtmlcommon::start_funclist();
-
         if ($allowed) {
-            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+			#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&amp;register=1">'
+                           .&mt('Show Public View').'</a>'
+                           .&Apache::loncommon::help_open_topic(
+                                'Uploaded_Templates_PublicView'));
+			} else {
+            	$functions.=&Apache::lonhtmlcommon::add_item_funclist(
                           '<a href="'.$r->uri.'?forcestudent=1">'
                            .&mt('Show Public View').'</a>'
                            .&Apache::loncommon::help_open_topic(
                                 'Uploaded_Templates_PublicView'));
+			}
         } elsif ($privileged) {
-            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+			if($env{'form.register'} == 1) {
+	            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                           '<a href="'.$r->uri.'?forceedit=1&amp;register=1">'
+                            .&mt('Edit').'</a>');
+			} else {
+	            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
                            '<a href="'.$r->uri.'?forceedit=1">'
                             .&mt('Edit').'</a>');
+			}
         }
 
         $functions.=&Apache::lonhtmlcommon::end_funclist();
@@ -259,8 +275,8 @@ ENDSCRIPT
                  .'&nbsp;'.&Apache::loncommon::help_open_topic('Syllabus_ExtLink')
                  .'</p>'
                  .'<p class="LC_info">'
-                 .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Parameters[_2].'
-                     ,'<a href="/adm/parmset?action=crsenv">','</a>')
+                 .&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&amp;phase=display">','</a>')
                  .'</p>'
         );
         #-Print Help Text
@@ -363,7 +379,7 @@ ENDSCRIPT
 # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
         if ($allowed) {
-            $r->print('<form method="post">'.
+            $r->print('<form method="post" action="">'.
             '<input type="hidden" name="forceedit" value="edit" />');
         }
         my @htmlids=();
@@ -393,35 +409,51 @@ 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);
+                    if (!&Apache::lonfeedback::contains_block_html($message)) {
+                    	&Apache::lonfeedback::newline_to_br(\$message);
+                    } else {
+                    	$message = &Apache::lonfeedback::tidy_html($message);
+					}
                     $message =~s|(https?\://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
+                    $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,$syllabusfields{$field},'LC_Box');
+                        $r->print($message);
                         if ($allowed) {
-                            $r->print('<p>');
-                        }
-                        &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_Box');
+                            $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') {
-                        $r->print('</p>');
-                        &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
-                    }
-                }
             }
         }
         if ($allowed) {