--- loncom/interface/lonsyllabus.pm	2003/03/25 19:18:40	1.17
+++ loncom/interface/lonsyllabus.pm	2003/09/09 19:39:04	1.22
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.17 2003/03/25 19:18:40 www Exp $
+# $Id: lonsyllabus.pm,v 1.22 2003/09/09 19:39:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,7 @@ use Apache::loncommon;
 use Apache::lonnet;
 use Apache::lontexconvert;
 use Apache::lonfeedback;
+use Apache::lonannounce;
 
 sub handler {
     my $r = shift;
@@ -92,11 +93,13 @@ ENDDOCUMENT
        ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'}));
     $r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.
               $Apache::lonnet::domaindescription{$cdom}.'</h3>');
-
+# -------------------------------------------------------------- Announcements?
+    $r->print(&Apache::lonannounce::showday(time,2,
+                         &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)));
 # -------------------------------------------------------- Get course personnel
     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
     $r->print('<table border="2">');
-    foreach (keys %coursepersonnel) {
+    foreach (sort keys %coursepersonnel) {
 	$r->print('<tr><td>'.$_.'</td><td>');
         foreach (split(/\,/,$coursepersonnel{$_})) {
 	    my ($puname,$pudom)=split(/\:/,$_);
@@ -116,7 +119,7 @@ ENDDOCUMENT
     if ($ENV{'user.environment'}) {
 # does this user have privileges to post, etc?
        if ($ENV{'request.course.id'}) {
-          $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
+          $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'});
           if ($forcestudent) { $allowed=0; }
        }
        if ($allowed) {
@@ -124,7 +127,7 @@ ENDDOCUMENT
 &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'</p><p>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><a href="'.$r->uri.'?forcestudent=1">Show Student View</a>'.
+	  '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">Show Public View</font></a>'.
           &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
           '</p>');
       }
@@ -207,7 +210,7 @@ ENDDOCUMENT
                   if ($allowed) {
                      $r->print('<h3>'.$syllabusfields{$_}.
           &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>'.
-	  '<p><a href="'.$r->uri.'?forcestudent=1">Show Student View</a>'.
+	  '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">Show Public View</font></a>'.
  &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
 		 } else {
                   $r->print($message);
@@ -215,7 +218,7 @@ ENDDOCUMENT
               } else {
                  $message=~s/\n/\<br \/\>/g;
                  $message
-             =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
+           =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
 	         $message=&Apache::lontexconvert::msgtexconverted($message);
                  $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
                         $message.'</blockquote>');