--- loncom/interface/lonsyllabus.pm	2008/10/22 08:56:35	1.68
+++ loncom/interface/lonsyllabus.pm	2009/02/20 17:45:40	1.79
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.68 2008/10/22 08:56:35 bisitz Exp $
+# $Id: lonsyllabus.pm,v 1.79 2009/02/20 17:45:40 neumanie 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;
@@ -161,20 +162,14 @@ ENDSCRIPT
                text=>"Course syllabus"});
             $r->print(&Apache::lonhtmlcommon::breadcrumbs());
         }
-        $r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.
-		  &Apache::lonnet::domain($cdom,'description').'</h3>');
+	 $r->print('<div class="LC_ContentBoxSpecial">');
+	$r->print('<h2 class="LC_hcell">'.$courseenv{'description'}.'</h2>'); 
+	$r->print('<blockquote>');       
+	$r->print('<h3>'.  &Apache::lonnet::domain($cdom,'description').'</h3>');
     } else {
 	$r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
 		  &Apache::lonnet::domain($cdom,'description').'}\\\\');
     }
-# -------------------------------------------------------------- Announcements?
-    my $day = &Apache::lonannounce::showday(time,2,
-			 &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
-    if ($target ne 'tex') {
-	$r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
-    } else {
-	$r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
-    }
 
 # -------------------------------------------------------- Get course personnel
     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
@@ -183,7 +178,9 @@ ENDSCRIPT
     } 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::lonhtmlcommon::row_title($element));
 	} else {
@@ -206,7 +203,8 @@ ENDSCRIPT
 	    }
 	}
 	if ($target ne 'tex') {
-	    $r->print(&Apache::lonhtmlcommon::row_closure());
+            my $lastclose=$element eq $lastpers?1:0;
+            $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
 	} else {
 	    $r->print('\\\\ \hline');
 	}
@@ -236,22 +234,14 @@ ENDSCRIPT
           if ($forcestudent or $target eq 'tex') { $allowed=0; }
        }
        if ($allowed) {
-          $r->print('<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://'.
+          my $protocol = $Apache::lonnet::protocol{$homeserver};
+          $protocol = 'http' if ($protocol ne 'https');
+          $r->print('<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>'.$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>');
-      } elsif ($privileged) {
-	  if ($target ne 'tex') {
-	      $r->print('<p><a href="'.$r->uri.'?forceedit=1"><font size="+1">'.
-			&mt('Edit').'</font></a>'); 
-	  }
-      }
+          '<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>');
+      } 
        if (($allowed) && ($env{'form.storesyl'})) {
 	   foreach my $syl_field (keys(%syllabusfields)) {
                my $field=$env{'form.'.$syl_field};
@@ -268,7 +258,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
@@ -281,7 +271,7 @@ ENDSCRIPT
 		          }
 		      }
 # norm internal URLs
-                      unless ($url=~/^http\:/) {
+                      unless ($url=~/^https?\:/) {
 		          $url=&Apache::lonnet::clutter($url);
                       }
 # re-assemble field
@@ -298,74 +288,96 @@ ENDSCRIPT
            &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);
        }
     }
-# ---------------------------------------------------------------- Get syllabus
-    if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
-       my $lastmod=$syllabus{'uploaded.lastmodified'};
+#----------Print last update
+ my $lastmod=$syllabus{'uploaded.lastmodified'};
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
        my $who = &Apache::loncommon::aboutmewrapper(
                     &Apache::loncommon::plainname($syllabus{'uploaded.name'},
                      $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'},
-                     $syllabus{'uploaded.domain'});
-       if ($target ne 'tex') {
+                     $syllabus{'uploaded.domain'});      
+ if ($target ne 'tex') {
 	   $r->print('<table><tr><td>'.&mt('Last updated').':</td><td>'.
 		     $lastmod.'</td><td>'.
 		     ($who ? &mt('by').' '.$who
                            : '' ).
-		     '</td></tr></table><p>');
+		     '</td></tr></table>');
        } else {
 	   $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
 		     ($who? &mt('by').'\\\\ '.
 		            &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
 		          :'')
 		     .'\\\\');
-       }
+       }	
+#--------Functions
+if ($target ne 'tex') {
+		if($allowed || $privileged){		
+		&Apache::lontemplate::print_start_page_functions($r);
+		if($allowed){ 		
+		&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Public View').'</a>'.				&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'));	      		
+		}elsif($privileged){
+			&Apache::lontemplate::print_functions_content($r,'<a href="'.$r->uri.'?forceedit=1">'.&mt('Edit').'</a>'); 
+		}
+		&Apache::lontemplate::print_end_page_functions($r);
+		}
+ }
+# -------------------------------------------------------------- Announcements?
+    my $day = &Apache::lonannounce::showday(time,2,
+			 &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
+    if ($target ne 'tex') {	
+	&Apache::lontemplate::print_template($r,'RSS Feeds and Blogs',&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit),1,'LC_ContentBoxSpecial');
+    } else {
+	$r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
+    }	
+# ---------------------------------------------------------------- Get syllabus
+    if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {     
        if ($allowed) {
 	   $r->print('<form method="post">'.
 		     '<input type="hidden" name="forceedit" value="edit" />');
        }
        my @htmlids=();
-       foreach my $field (sort(keys(%syllabusfields))) {
+	
+	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
-		   my $urls=$message;
-		   $message='';
-		   foreach my $filelink (split(/\n/,$urls)) {
+		   my $urls=$message;		
+		   $message='';		  
+		   foreach my $filelink (split(/\n/,$urls)) {			
 		       my $output='';
-# embed style?
-		       my ($curfext)=($filelink=~/\.([^\.]+)$/);
-		       my $embstyle=&Apache::loncommon::fileembstyle($curfext);
-		       if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {
-# make ssi call and remove everything but the body contents
+			# embed style?
+		       my ($curfext)=($filelink=~/\.([^\.]+)$/);		
+		       my $embstyle=&Apache::loncommon::fileembstyle($curfext);			
+		       if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {# make ssi call and remove everything but the body contents
 			   $output=&Apache::lonnet::ssi_body($filelink);
-		       } elsif ($embstyle eq 'img') {
-# embed as an image
+		       } elsif ($embstyle eq 'img') {# embed as an image
 			   $output='<img src="'.$filelink.'" />';
 		       }
-		       if ($target ne 'tex') {
-			   $message.='<p>'.$output.'</p>';
-		       } else {
-			   $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
-		       }      
+		       if($output ne ''){
+		       		if ($target ne 'tex') {				
+			  	 	$message.='<p>'.$output.'</p>';
+		       		} else {
+			   		$message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
+		       		}
+			}     
 		   }
 		   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,$allowed,'LC_ContentBoxSpecial');
 		   } else {
 		       $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
 				 &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -373,23 +385,28 @@ 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('</form>'.
 		     &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
        }
-       if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
+      # if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
     } else {
 	if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');} 
 	$r->print(&mt('No syllabus information provided.'));
 	if ($target ne 'tex') {$r->print('</p>');}
     }
-    if ($target ne 'tex') {
+    if ($target ne 'tex') {	
+	$r->print('</blockquote>');
+    	$r->print('</div>');		
         if ($env{'form.backto'} eq 'coursecatalog') {
             $r->print('<form name="backtocat" method="post" action="/adm/coursecatalog">'.
                       &Apache::lonhtmlcommon::echo_form_input(['backto','courseid']).