--- loncom/interface/lonsyllabus.pm	2008/07/17 12:01:46	1.66
+++ loncom/interface/lonsyllabus.pm	2008/11/19 11:51:49	1.70
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.66 2008/07/17 12:01:46 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.70 2008/11/19 11:51:49 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,6 +29,7 @@
 package Apache::lonsyllabus;
 
 use strict;
+use Apache::lontemplate;
 use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::lonnet;
@@ -179,14 +180,15 @@ ENDSCRIPT
 # -------------------------------------------------------- Get course personnel
     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
     if ($target ne 'tex') {
-	$r->print(&Apache::loncommon::start_data_table());
+	$r->print(&Apache::lonhtmlcommon::start_pick_box());
     } else {
 	$r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
     }
-    foreach my $element (sort keys %coursepersonnel) {
+    my @personnel=sort keys %coursepersonnel;
+    my $lastpers=$personnel[$#personnel];
+    foreach my $element (@personnel) {
 	if ($target ne 'tex') {
-	    $r->print(&Apache::loncommon::start_data_table_row().
-		      '<td>'.$element.'</td><td>');
+	    $r->print(&Apache::lonhtmlcommon::row_title($element));
 	} else {
 	    $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); 
 	}
@@ -198,8 +200,8 @@ ENDSCRIPT
                     ($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
 		    $r->print(' '.$courseperson);
                 } else {
-                    $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson),
-                              $puname,$pudom);
+                    $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson,
+                              $puname,$pudom));
                 }
 	    } else {
 		$r->print(' '.&Apache::loncommon::plainname($puname,
@@ -207,13 +209,14 @@ ENDSCRIPT
 	    }
 	}
 	if ($target ne 'tex') {
-	    $r->print('</td>'.&Apache::loncommon::end_data_table_row());
+            my $lastclose=$element eq $lastpers?1:0;
+            $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
 	} else {
 	    $r->print('\\\\ \hline');
 	}
     }
     if ($target ne 'tex') {
-	$r->print(&Apache::loncommon::end_data_table());
+	$r->print(&Apache::lonhtmlcommon::end_pick_box());
     } else {
 	$r->print('\end{tabular}\\\\');
     }
@@ -351,8 +354,8 @@ 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('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>');
 		   } else {
 		       $r->print($message);
@@ -365,8 +368,9 @@ ENDSCRIPT
 		   }
 		   $message=&Apache::lontexconvert::msgtexconverted($message);
 		   if ($target ne 'tex') {
-		       $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.
-				 $message.'</blockquote>');
+			&Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
+#		       $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.
+#			 $message.'</blockquote>');
 		   } else {
 		       $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
 				 &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -374,9 +378,10 @@ ENDSCRIPT
 		   push(@htmlids,$field);
 	       }
 	       if ($allowed) {
-		   $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);	
+#	   $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').'" />');
 	       }
 	   }
        }