--- loncom/interface/lonsyllabus.pm	2008/07/17 12:01:46	1.66
+++ loncom/interface/lonsyllabus.pm	2008/12/24 07:55:54	1.75
@@ -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.75 2008/12/24 07:55:54 raeburn 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}\\\\');
     }
@@ -237,16 +240,17 @@ ENDSCRIPT
           if ($forcestudent or $target eq 'tex') { $allowed=0; }
        }
        if ($allowed) {
-          $r->print('<p>'.
+          my $protocol = $Apache::lonnet::protocol{$homeserver};
+          $protocol = 'http' if ($protocol ne 'https');
+          $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://'.
+		    .' <tt>'.$protocol.'://'.
 		    &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">'.
@@ -269,7 +273,7 @@ ENDSCRIPT
 # get rid of leading and trailing spaces
                       $url=~s/^\s+//;
                       $url=~s/\s+$//;
-                      if ($url=~m|^http://([^/]+)/(.+)$|) {
+                      if ($url=~m|^https?\://([^/]+)/(.+)$|) {
 			  my $host = $1;
                           my $remainder=$2;
 # remove the hostname from internal URLs
@@ -282,7 +286,7 @@ ENDSCRIPT
 		          }
 		      }
 # norm internal URLs
-                      unless ($url=~/^http\:/) {
+                      unless ($url=~/^https?\:/) {
 		          $url=&Apache::lonnet::clutter($url);
                       }
 # re-assemble field
@@ -325,7 +329,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
@@ -351,22 +357,22 @@ 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);
 		   } 
 	       } else {
 		   &Apache::lonfeedback::newline_to_br(\$message);
-		   $message =~s|(https*://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
+		   $message =~s|(https?\://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
 		   if ($allowed) {
 		       $message=&Apache::lonspeller::markeduptext($message);
 		   }
 		   $message=&Apache::lontexconvert::msgtexconverted($message);
 		   if ($target ne 'tex') {
-		       $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.
-				 $message.'</blockquote>');
+			if($allowed){
+				$r->print('<p>');
+			}
+			&Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
 		   } else {
 		       $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
 				 &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -374,12 +380,19 @@ 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').'" />');
+			if($target ne 'tex'){
+				$r->print('</p>');
+			}
+			&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));