--- loncom/interface/lonsimplepage.pm	2006/03/16 21:30:00	1.33
+++ loncom/interface/lonsimplepage.pm	2006/07/20 15:03:01	1.46
@@ -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.46 2006/07/20 15:03:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,15 +37,8 @@ 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;
+use LONCAPA;
 
 sub handler {
     my $r = shift;
@@ -54,45 +47,46 @@ 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);
+    my (undef,undef,$udom,$uname,$marker)=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'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $grp_view_permission = &Apache::lonnet::allowed('vcg',
-                                                   $env{'request.course.id'});
-    my $namespace;
-
+    my ($namespace,$group,$group_desc,$group_home_view,$group_home_edit,
+        $group_view_perm,$group_edit_perm);
     my %curr_group = ();
     my %groupinfo = ();
-    if ($caller eq 'grppg') {
+    if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) {
         $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');
+        $group = $marker;
+        my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group);
+        if (!%curr_groups) {
+	    &Apache::loncommon::simple_error_page($r,'','Invalid group name');
+	    return OK;
         }
-        %groupinfo = &Apache::loncommon::get_group_settings($curr_groups{$marker});
-    } else {  
+        %groupinfo = 
+	    &Apache::longroup::get_group_settings($curr_groups{$group});
+        $group_desc = &unescape($groupinfo{'description'});
+        $namespace = 'grppage_'.$group;
+    } 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
@@ -100,27 +94,25 @@ sub handler {
        'aaa_title'         => 'Page Title',
        'bbb_content'       => 'Content',
        'ccc_webreferences' => 'Web References');
-    if ($caller eq 'grppg') {
-        $syllabusfields{'abb_links'} = &mt('Functionality');
+    if ($group ne '') {
+        $syllabusfields{'abb_links'} = &mt('Available Group Tools');
     }
 
 
 # ------------------------------------------------------------ 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));
-    }
+                        ($ENV{'QUERY_STRING'},['forcestudent','forceedit',
+                                               'register','ref']);
 # --------------------------------------------------------------- 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 $refarg;
+    if ($env{'form.ref'}) {
+        $refarg = '&ref='.$env{'form.ref'};
+    }
    
     my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs);
        
@@ -128,42 +120,58 @@ sub handler {
 
     if ($target ne 'tex') {
         my $title = 'Course Page';
-        if ($caller eq 'grppg') {
+        if ($group ne '') {
             $title = 'Group Page';
         }
-	$r->print(&Apache::lonhtmlcommon::htmlareaheaders().
-		  &Apache::loncommon::endheadtag().
-		  &Apache::loncommon::bodytag($title,$forcestudent,$addentries,
-					      '',$dom,$env{'form.register'}));
-    }
-
-    if ($caller eq 'grppg') {
-        if (($grp_view_permission) || 
-                           (&Apache::loncommon::check_group_access($caller))) {
-            unless(&Apache::lonnet::allowed('vgh',
-                                      $env{'request.course.id'}.'/'.$marker)) {
-                &display_group_links($r,$target,$marker,'view',%groupinfo);
+	my $start_page = 
+	    &Apache::loncommon::start_page($title,undef,
+					   {'function'       => $forcestudent,
+					    'domain'         => $dom,
+					    'force_register' =>
+						$env{'form.register'},});
+	$r->print($start_page);
+    }
+
+    if ($group ne '') {
+        my $group_view_perm =
+               &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.
+               ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
+        $group_edit_perm =
+               &Apache::lonnet::allowed('mdg',$env{'request.course.id'}.
+               ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
+        $group_home_view = &Apache::lonnet::allowed('vgh',
+                                         $env{'request.course.id'}.'/'.$group);
+        $group_home_edit = &Apache::lonnet::allowed('mgh',
+                                         $env{'request.course.id'}.'/'.$group);
+        if ($group_view_perm || $group_edit_perm || $group_home_view || 
+            $group_home_edit || &Apache::longroup::check_group_access($group)) {
+            if (($env{'form.ref'} eq 'grouplist') && ($target ne 'tex')) {
+                $r->print(&grouppage_breadcrumbs($dom,$crs,$group,$group_desc));
+            }
+            if ((!$group_home_edit) && (!$group_home_view) && 
+                (!$group_view_perm) && (!$group_edit_perm)) {  
+                &display_group_links($r,$target,$group,'view',$refarg,%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;
         }
     }
 
     my $allowed;
-    if ($caller eq 'grppg') {
-        $allowed  = $grp_view_permission;
-        unless ($allowed) {
-            $allowed = &Apache::lonnet::allowed('mgh',$env{'request.course.id'}.
-                                                                  '/'.$marker);
+    
+    if ($group ne '') {
+        $allowed  = $group_edit_perm;
+        if (!$allowed) {
+            $allowed = $group_home_edit; 
         }
     } else { 
         $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
@@ -174,13 +182,25 @@ sub handler {
     }
 
     if ($forcestudent or $target eq 'tex') { $allowed=0; }
-    
+
     if ($allowed) {
 	$r->print('<p>'.
-		  &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'<br /><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Student View').'</font></a>'.
+		  &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'<br /><a href="'.$r->uri.'?forcestudent=1'.$refarg.'"><font size="+1">'.&mt('Show Student View').'</font></a>'.
 		  &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
     } elsif ($privileged and $target ne 'tex') {
-	$r->print('<a href="'.$r->uri.'?forceedit=edit"><font size="+1">'.&mt('Edit').'</font></a>');
+        my $edittext = &mt('Edit');
+        if ($group ne '') {
+            $edittext = &mt('Edit Group Homepage');
+        }
+	$r->print('<a href="'.$r->uri.'?forceedit=edit'.$refarg.'"><font size="+1">'.$edittext.'</font></a>');
+        if ($group ne '') {
+            if ($group_edit_perm) {
+                $r->print('&nbsp;&nbsp;&nbsp;<font size="+1">'.
+               '<a href="/adm/coursegroups?action=modify&amp;refpage=grouplist'.
+               '&amp;state=pick_task&amp;groupname='.$group.'">'.
+               &mt('Edit Group Settings').'</a></font>');
+            }
+        }    
     } 
     if (($env{'form.uploaddoc.filename'} and $target ne 'tex') &&
 	($env{'form.storeupl'}) && ($allowed)) {
@@ -188,9 +208,9 @@ sub handler {
 	    if ($syllabus{'uploaded.photourl'}) {
 		&Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
 	    }
-            if ($caller eq 'grppage') {
+            if ($group ne '') {
                 $syllabus{'uploaded.photourl'}=&Apache::lonnet::userfileupload(
-                                              'uploaddoc',1,"grouppage/$marker");
+                                              'uploaddoc',1,"grouppage/$group");
             } else {
 	        $syllabus{'uploaded.photourl'}=
 		     &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage');
@@ -214,9 +234,11 @@ sub handler {
     }
 
 # ---------------------------------------------------------------- Get syllabus
-    if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
+    if ((($syllabus{'uploaded.lastmodified'}) && 
+         (($group ne '' && ($group_home_view || $group_edit_perm ||  
+           $group_view_perm)) || ($group eq ''))) || ($allowed)) {
 	if ($syllabus{'uploaded.photourl'}) {
-	    &Apache::lonnet::allowuploaded('/adm/'.$caller,
+	    &Apache::lonnet::allowuploaded('/adm/smppg',
 					   $syllabus{'uploaded.photourl'});
 	    
 	    my $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
@@ -236,7 +258,8 @@ sub handler {
 		      '</form><form method="post">');
 	}
 	foreach (sort keys %syllabusfields) {
-	    if (($syllabus{$_}) || ($allowed)) {
+	    if (($syllabus{$_}) || ($allowed) || 
+                ($_ eq 'abb_links' && $group ne '')) {
 		my $message=$syllabus{$_};
 		&Apache::lonfeedback::newline_to_br(\$message);
 		$message
@@ -245,10 +268,11 @@ sub handler {
 		    $message=&Apache::lonspeller::markeduptext($message);
 		}
 		$message=&Apache::lontexconvert::msgtexconverted($message);
-                if ($_ eq 'abb_links' && $caller eq 'grppg') {
+                if ($_ eq 'abb_links' && $group ne '') {
                     $r->print('<br /><input type="hidden" name="'.$_.
                                           '" value="'.$syllabus{$_}.'" />');
-                    &display_group_links($r,$target,$marker,'edit',%groupinfo);
+                    &display_group_links($r,$target,$group,'edit',$refarg,
+                                         %groupinfo);
                     $r->print('<br />');
                 } elsif ($_ eq 'aaa_title') {
                     if ($target ne 'tex') {
@@ -303,7 +327,11 @@ sub handler {
 	}
 	if ($env{'form.grade_target'} ne 'tex') {$r->print('</p>');}
     } else {
-	$r->print('<p>No page information provided.</p>');
+        if ($group ne '') {
+            &display_group_links($r,$target,$group,'view',$refarg,%groupinfo);
+        } else {
+	    $r->print(&mt('<p>No page information provided.</p>'));
+        }
     }
     if ($env{'form.grade_target'} ne 'tex') {
 	$r->print(&Apache::loncommon::end_page());
@@ -314,28 +342,30 @@ sub handler {
 }
 
 sub display_group_links {
-    my ($r,$target,$marker,$context,%groupinfo) = @_;
+    my ($r,$target,$group,$context,$refarg,%groupinfo) = @_;
     my @available = ();
     my %menu = ();
     %{$menu{'email'}} = (
                         text => 'Group e-mail',
-                        href => '/adm/email?group='.$marker,
+                        href => '/adm/email?compose=group&amp;group='.$group.
+                                $refarg,
                       );
     %{$menu{'discussion'}} = (
                         text => 'Discussion Boards',
-                        href => '/adm/groupboards?group='.$marker,
+                        href => '/adm/groupboards?group='.$group.$refarg,
                       );
     %{$menu{'chat'}} = (
                         text => 'Group chat',
-                        href => "javascript:group_chat('$marker')",
+                        href => "javascript:group_chat('$group')",
                       );
     %{$menu{'files'}} = (
                         text => 'File repository',
-                        href => '/adm/portfolio?group='.$marker,
+                        href => '/adm/coursegrp_portfolio?group='.$group.
+                                $refarg,
                       );
     %{$menu{'roster'}} = (
                         text => 'Membership roster',
-                        href => '/adm/grouproster?group='.$marker,
+                        href => '/adm/grouproster?group='.$group.$refarg,
                       );
     foreach my $tool (sort(keys(%menu))) {
         if ($groupinfo{functions}{$tool} eq 'on') {
@@ -346,7 +376,7 @@ sub display_group_links {
         my $output = '<table cellspacing="4" cellpadding="4"><tr>';
         foreach my $tool (@available) {
             if ($target eq 'tex') {
-                $output .= '<td>'.$menu{$tool}{text}.'</td>';
+                $output .= '<td>'.&mt($menu{$tool}{text}).'</td>';
             } else {
                 $output .= '<td><a href="'.$menu{$tool}{href}.'">'.
                            $menu{$tool}{text}.'</a></td>';
@@ -354,16 +384,16 @@ sub display_group_links {
         }
         $output .= '</tr></table>';
         if ($target eq 'tex') {
-            $r->print(&Apache::lonxml::xmlparse($r,'tex','Available functions<br /><br />'.$output));
+            $r->print(&Apache::lonxml::xmlparse($r,'tex',&mt('Available functions').'<br /><br />'.$output));
         } else {
-            $r->print('<h3>Functions</h3>'.$output);
+            $r->print('<h3>'.&mt('Available Group Tools').'</h3>'.$output);
         }
     } else {
         my $output;
         if ($context eq 'edit') {
-            $output = 'No group functionality';
+            $output = &mt('No group functionality.');
         } else {  
-            $output = 'No group functionality (e.g., e-mail, discussion, chat or file upload) is currently available to you in this group: '.$marker;
+            $output = &mt('No group functionality (e.g., e-mail, discussion, chat or file upload) is currently available to you in this group: <b>[_1]</b>.',&unescape($groupinfo{'description'}));
         }
         if ($target eq 'tex') {
             $r->print(&Apache::lonxml::xmlparse($r,'tex',$output));
@@ -372,7 +402,22 @@ sub display_group_links {
         }
     }
 }
- 
+
+sub grouppage_breadcrumbs {
+    my ($cdom,$cnum,$group,$description) = @_;
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/coursegroups",
+          text=>"Groups",
+          title=>"Display Groups"},
+        {href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist",
+          text=>"Group: $description",
+          title=>"Go to group's home page"},
+        );
+    my $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group page - [_1]',
+                                                           $description));
+    return $output;
+}
 
 1;
 __END__