--- loncom/interface/lonsimplepage.pm	2006/03/16 21:30:00	1.33
+++ loncom/interface/lonsimplepage.pm	2006/05/18 01:08:50	1.40
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.33 2006/03/16 21:30:00 raeburn Exp $
+# $Id: lonsimplepage.pm,v 1.40 2006/05/18 01:08:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,15 +37,7 @@ use Apache::lonfeedback;
 use Apache::lonlocal;
 use Apache::lonprintout;
 use Apache::lonxml;
-
-sub error {
-    my ($r,$msg) = @_;
-    $r->print(&Apache::loncommon::endheadtag().
-	      &Apache::loncommon::bodytag().
-	      &mt($msg).
-	      &Apache::loncommon::end_page());
-    return OK;
-}
+use Apache::longroup;
 
 sub handler {
     my $r = shift;
@@ -54,20 +46,18 @@ sub handler {
     return OK if $r->header_only;
     my $target=$env{'form.grade_target'};
 # ------------------------------------------------------------ Print the screen
-    if ($target ne 'tex') {
-	$r->print(&Apache::lonxml::xmlbegin().
-		  &Apache::loncommon::headtag());
-    } else {
+    if ($target eq 'tex') {
 	$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
     } 
     my (undef,undef,undef,undef,$marker,$caller)=split(/\//,$r->uri);
 # Is this even in a course?
     unless ($env{'request.course.id'}) {
 	if ($target ne 'tex') {
-	    return &error($r,'Not in a course');
+	    &Apache::loncommon::simple_error_page($r,'','Not in a course');
 	} else {
 	    $r->print('\textbf{Not in a course}\end{document}');
 	}
+	return OK;
     }
 
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -81,18 +71,21 @@ sub handler {
     if ($caller eq 'grppg') {
         $marker =~ s/\W//g;
         $namespace = 'grppage_'.$marker;
-        my %curr_groups;
-        if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) {
-	    return &error($r,'Invalid group name');
+        my %curr_groups = &Apache::loncommon::coursegroups($dom,$crs,$marker);
+        if (!%curr_groups) {
+	    &Apache::loncommon::simple_error_page($r,'','Invalid group name');
+	    return OK;
         }
-        %groupinfo = &Apache::loncommon::get_group_settings($curr_groups{$marker});
+        %groupinfo = 
+	    &Apache::longroup::get_group_settings($curr_groups{$marker});
     } else {  
         $marker=~s/\D//g;
         $namespace = 'smppage_'.$marker;
     }
 
     if (!$marker) {
-	return &error($r,'Invalid call');
+	&Apache::loncommon::simple_error_page($r,'','Invalid call');
+	return OK;
     }
 
 # --------------------------------------------------------- The syllabus fields
@@ -108,18 +101,11 @@ sub handler {
 # ------------------------------------------------------------ Get query string
     &Apache::loncommon::get_unprocessed_cgi
                         ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register']);
-# ----------------------------------------------------- Force menu registration
-    my $addentries='';
-    if ($env{'form.register'}) {
-       $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
-	   '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
-       $r->print(&Apache::lonmenu::registerurl(1));
-    }
 # --------------------------------------------------------------- Force Student
     my $forcestudent='';
     if ($env{'form.forcestudent'} || $target eq 'tex' ) { $forcestudent='student'; };
-     my $forceedit='';
-     if ($env{'form.forceedit'}) { $forceedit='edit'; }
+    my $forceedit='';
+    if ($env{'form.forceedit'}) { $forceedit='edit'; }
 
    
     my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs);
@@ -131,30 +117,33 @@ sub handler {
         if ($caller eq 'grppg') {
             $title = 'Group Page';
         }
-	$r->print(&Apache::lonhtmlcommon::htmlareaheaders().
-		  &Apache::loncommon::endheadtag().
-		  &Apache::loncommon::bodytag($title,$forcestudent,$addentries,
-					      '',$dom,$env{'form.register'}));
+	my $start_page = 
+	    &Apache::loncommon::start_page($title,undef,
+					   {'function'       => $forcestudent,
+					    'domain'         => $dom,
+					    'force_register' =>
+						$env{'form.register'},});
+	$r->print($start_page);
     }
 
     if ($caller eq 'grppg') {
         if (($grp_view_permission) || 
-                           (&Apache::loncommon::check_group_access($caller))) {
+                           (&Apache::longroup::check_group_access($caller))) {
             unless(&Apache::lonnet::allowed('vgh',
                                       $env{'request.course.id'}.'/'.$marker)) {
                 &display_group_links($r,$target,$marker,'view',%groupinfo);
                 return OK;
             }
         } else {
+	    my $msg = 
+		&mt('You do not currently have rights to view this group.');
             if ($target ne 'tex') {
-                $r->print(&Apache::loncommon::endheadtag().
-			  &Apache::loncommon::bodytag().
-			  'You do not currently have rights to view this group.'.
+                $r->print("<p>$msg</p>".
 			  &Apache::loncommon::end_page());
-                return OK;
             } else {
-                $r->print('\textbf{You do not currently have rights to view this group}\end{document}');
+                $r->print('\textbf{'.$msg.'}\end{document}');
             }
+	    return OK;
         }
     }
 
@@ -319,7 +308,7 @@ sub display_group_links {
     my %menu = ();
     %{$menu{'email'}} = (
                         text => 'Group e-mail',
-                        href => '/adm/email?group='.$marker,
+                        href => '/adm/email?compose=group&group='.$marker,
                       );
     %{$menu{'discussion'}} = (
                         text => 'Discussion Boards',
@@ -331,7 +320,7 @@ sub display_group_links {
                       );
     %{$menu{'files'}} = (
                         text => 'File repository',
-                        href => '/adm/portfolio?group='.$marker,
+                        href => '/adm/coursegrp_portfolio?group='.$marker,
                       );
     %{$menu{'roster'}} = (
                         text => 'Membership roster',