--- loncom/interface/lonsyllabus.pm	2008/12/16 10:03:56	1.72
+++ loncom/interface/lonsyllabus.pm	2008/12/16 20:00:11	1.73
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.72 2008/12/16 10:03:56 schualex Exp $
+# $Id: lonsyllabus.pm,v 1.73 2008/12/16 20:00:11 ehlerst Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -240,16 +240,15 @@ ENDSCRIPT
           if ($forcestudent or $target eq 'tex') { $allowed=0; }
        }
        if ($allowed) {
-          $r->print('<p>'.
+          $r->print('<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.
+&mt('Show Public View').'</font></a>'.
+          &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
+          '</p><p>'.
 &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p><p>'.&mt('This syllabus can be publicly viewed at')
 		    .' <tt>http://'.
 		    &Apache::lonnet::hostname($homeserver).$r->uri.'</tt>'.
                &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'.
-          '<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>'.
-	  '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.
-&mt('Show Public View').'</font></a>'.
-          &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
-          '</p>');
+          '<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>');
       } elsif ($privileged) {
 	  if ($target ne 'tex') {
 	      $r->print('<p><a href="'.$r->uri.'?forceedit=1"><font size="+1">'.
@@ -328,7 +327,9 @@ ENDSCRIPT
 		     '<input type="hidden" name="forceedit" value="edit" />');
        }
        my @htmlids=();
-       foreach my $field (sort(keys(%syllabusfields))) {
+	&Apache::lontemplate::start_columnSection($r);
+	&Apache::lontemplate::start_ContentBox($r, $allowed);
+	foreach my $field (sort(keys(%syllabusfields))) {
 	   if (($syllabus{$field}=~/\w/) || ($allowed)) {
 	       my $message=$syllabus{$field};
 	       if ($field eq 'lll_includeurl') { # this is the "included" field
@@ -354,9 +355,7 @@ ENDSCRIPT
 		   }
 		   if ($allowed) {
 		       $r->print('<h3>'.$syllabusfields{$field}.
-			 &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>'.
-			 '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.
-				 &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
+			 &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>');
 		   } else {
 		       $r->print($message);
 		   } 
@@ -367,18 +366,8 @@ ENDSCRIPT
 		       $message=&Apache::lonspeller::markeduptext($message);
 		   }
 		   $message=&Apache::lontexconvert::msgtexconverted($message);
-
-		   &Apache::lontemplate::start_columnSection($r);
-        	   &Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
-		  
- 		   if ($target ne 'tex') {
-   			&Apache::lontemplate::start_ContentBox($r);
-                	&Apache::lontemplate::end_ContentBox($r);
-                	&Apache::lontemplate::end_columnSection($r);
-                	&Apache::lontemplate::start_columnSection($r);
-                	&Apache::lontemplate::start_ContentBox($r);
-                	&Apache::lontemplate::end_ContentBox($r);
-                	&Apache::lontemplate::end_columnSection($r);
+		   if ($target ne 'tex') {
+			&Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
 
 		   } else {
 		       $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
@@ -387,13 +376,16 @@ ENDSCRIPT
 		   push(@htmlids,$field);
 	       }
 	       if ($allowed) {
-		&Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);	
-#	   $r->print('<br /><textarea cols="80" rows="12" name="'.$field.'" id="'.$field.'">'.
-	#		     &HTML::Entities::encode($syllabus{$field},'"&<>').
-	#		     '</textarea> <input type="submit" name="storesyl" value="'.&mt('Save').'" />');
+		&Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
 	       }
 	   }
        }
+        if ($allowed) {
+                $r->print('<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.
+                                 &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
+        }
+	&Apache::lontemplate::end_ContentBox($r);
+	&Apache::lontemplate::end_columnSection($r);
        if ($allowed) {
 	   $r->print('</form>'.
 		     &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));