--- loncom/interface/lonbulletin.pm	2002/09/10 19:01:53	1.1
+++ loncom/interface/lonbulletin.pm	2002/09/10 20:53:36	1.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
-# Bulletin Board
+# Simple Page Editor
 #
-# $Id: lonbulletin.pm,v 1.1 2002/09/10 19:01:53 www Exp $
+# $Id: lonbulletin.pm,v 1.2 2002/09/10 20:53:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,7 +47,7 @@ sub handler {
 <title>The LearningOnline Network with CAPA</title>
 </head>
 ENDDOCUMENT
-    my (undef,undef,$marker)=split(/\//,$r->uri);
+    my (undef,undef,undef,undef,$marker)=split(/\//,$r->uri);
 # Is this even in a course?
     unless ($ENV{'request.course.id'}) {
 	$r->print('<body>Not in a course</body>');
@@ -66,8 +66,8 @@ ENDDOCUMENT
 
 # --------------------------------------------------------- The syllabus fields
     my %syllabusfields=(
-       'aaa_title'         => 'Page Title',
-       'bbb_content'       => 'Content',
+       'aaa_title'         => 'Topic',
+       'bbb_content'       => 'Task',
        'ccc_webreferences' => 'Web References');
 
 # --------------------------------------------------------------- Force Student
@@ -81,7 +81,7 @@ ENDDOCUMENT
 # --------------------------------------- There is such a user, get environment
 
     $r->print(&Apache::loncommon::bodytag
-        ("Bulletin Board ".$syllabus{'aaa_title'},$forcestudent,'','',$dom));
+            ("Bulletin Board/Discussion",$forcestudent,'','',$dom));
 
     my $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
 
@@ -134,13 +134,26 @@ ENDDOCUMENT
               $message
              =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
 	      $message=&Apache::lontexconvert::msgtexconverted($message);
-              $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
+            unless ($_ eq 'aaa_title') {
+		if (($_ ne 'bbb_content') || ($allowed)) {
+                    $r->print('<h3>'.$syllabusfields{$_}.'</h3>');
+		}
+                 $r->print('<blockquote>'.
                         $message.'</blockquote>');
-              if ($allowed) {
-                 $r->print('<br /><textarea cols="80" rows="6" name="'.$_.'">'.
+                 if ($allowed) {
+                $r->print('<br /><textarea cols="80" rows="20" name="'.$_.'">'.
 			   $syllabus{$_}.
            '</textarea><input type="submit" name="storesyl" value="Store" />');
-	      }
+	        }
+	    } else {
+		$r->print('<h1>'.$message.'</h1>');
+                if ($allowed) {
+                 $r->print(
+                '<br />Topic<br /><textarea cols="80" rows="2" name="'.$_.'">'.
+			   $syllabus{$_}.
+           '</textarea><input type="submit" name="storesyl" value="Store" />');
+                }
+            }
 	  }
        }
        if ($allowed) {
@@ -150,7 +163,8 @@ ENDDOCUMENT
     } else {
        $r->print('<p>No page information provided.</p>');
     }
-    $r->print('</body></html>');
+    $r->print(&Apache::lonxml::xmlend(1,'bulletin___'.$marker.'___'.
+             'adm/wrapper'.$r->uri).'</body></html>');
     return OK;
 } 
 
