--- loncom/interface/lonsyllabus.pm	2008/12/17 00:44:53	1.74
+++ loncom/interface/lonsyllabus.pm	2009/02/19 18:55:53	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.74 2008/12/17 00:44:53 ehlerst Exp $
+# $Id: lonsyllabus.pm,v 1.78 2009/02/19 18:55:53 neumanie Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -168,15 +168,6 @@ ENDSCRIPT
 	$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);
     if ($target ne 'tex') {
@@ -220,6 +211,14 @@ ENDSCRIPT
     } else {
 	$r->print('\end{tabular}\\\\');
     }
+# -------------------------------------------------------------- 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));
+    }
 # ---------------------------------------------------------- Load syllabus info
     my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
     my $allowed=0;
@@ -240,21 +239,14 @@ ENDSCRIPT
           if ($forcestudent or $target eq 'tex') { $allowed=0; }
        }
        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><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>');
-      } elsif ($privileged) {
-	  if ($target ne 'tex') {
-	      $r->print('<p><a href="'.$r->uri.'?forceedit=1"><font size="+1">'.
-			&mt('Edit').'</font></a>'); 
-	  }
-      }
+      } 
        if (($allowed) && ($env{'form.storesyl'})) {
 	   foreach my $syl_field (keys(%syllabusfields)) {
                my $field=$env{'form.'.$syl_field};
@@ -271,7 +263,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
@@ -284,7 +276,7 @@ ENDSCRIPT
 		          }
 		      }
 # norm internal URLs
-                      unless ($url=~/^http\:/) {
+                      unless ($url=~/^https?\:/) {
 		          $url=&Apache::lonnet::clutter($url);
                       }
 # re-assemble field
@@ -322,13 +314,24 @@ ENDSCRIPT
 		          :'')
 		     .'\\\\');
        }
+     
+	if ($target ne 'tex') {
+		&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);
+	  }	
+      
        if ($allowed) {
 	   $r->print('<form method="post">'.
 		     '<input type="hidden" name="forceedit" value="edit" />');
        }
        my @htmlids=();
-	&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};
@@ -361,7 +364,7 @@ ENDSCRIPT
 		   } 
 	       } 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);
 		   }
@@ -369,8 +372,8 @@ ENDSCRIPT
 		   if ($target ne 'tex') {
 			if($allowed){
 				$r->print('<p>');
-			}
-			&Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
+			}			
+			&Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_ContentBoxSpecial');
 		   } else {
 		       $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
 				 &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -384,13 +387,8 @@ ENDSCRIPT
 			&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));