--- loncom/interface/lonsimplepage.pm	2006/03/21 21:07:31	1.34
+++ loncom/interface/lonsimplepage.pm	2006/05/09 14:38:10	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.34 2006/03/21 21:07:31 albertel Exp $
+# $Id: lonsimplepage.pm,v 1.39 2006/05/09 14:38:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,11 +52,11 @@ sub handler {
 # Is this even in a course?
     unless ($env{'request.course.id'}) {
 	if ($target ne 'tex') {
-	    return &Apache::loncommon::simple_error_page($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'};
@@ -70,10 +70,10 @@ 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 &Apache::loncommon::simple_error_page($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});
@@ -83,7 +83,8 @@ sub handler {
     }
 
     if (!$marker) {
-	return &Apache::loncommon::simple_error_page($r,'','Invalid call');
+	&Apache::loncommon::simple_error_page($r,'','Invalid call');
+	return OK;
     }
 
 # --------------------------------------------------------- The syllabus fields
@@ -99,18 +100,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);
@@ -122,10 +116,13 @@ 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') {
@@ -137,15 +134,15 @@ sub handler {
                 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;
         }
     }
 
@@ -310,7 +307,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',
@@ -322,7 +319,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',