--- loncom/interface/loncoursegroups.pm	2009/11/25 06:20:20	1.107
+++ loncom/interface/loncoursegroups.pm	2010/02/23 14:18:12	1.110
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.107 2009/11/25 06:20:20 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.110 2010/02/23 14:18:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -170,7 +170,7 @@ sub display_groups {
     my %actionlinks = (
       modify => '<a href="/adm/coursegroups?action=modify&refpage='.
                          $env{'form.refpage'}.'&state=pick_task&groupname=',
-      view => '<a href="/adm/'.$cdom.'/'.$cnum.'/',
+      view => '<a href="',
       delete => '<a href="/adm/coursegroups?action=delete&refpage='.
                          $env{'form.refpage'}.'&state=verify&groupname=',
       reenable => '<a href="/adm/coursegroups?action=reenable&refpage='.
@@ -221,6 +221,14 @@ sub display_groups {
                                                           $status);
 
         if (%curr_groups) {
+            my $navmap=Apache::lonnavmaps::navmap->new();
+            if (!defined($navmap)) {
+                $r->print('<div class="LC_error">'.
+                          &mt('An error occurred retrieving information about resources in the course.').'<br />'.
+                          &mt('It is recommended that you [_1]re-initialize the course[_2] and then return to this page.','<a href="/adm/roles?selectrole=1&newrole='.$env{'request.role'}.'&orgurl=%2fadm%2fcoursegroups">','</a>').
+                          '</div>');
+                return;
+            }
             if ($manage_permission) {
                 if ($action ne 'reenable') {
                     $r->print('<br /><a href="/adm/coursegroups?action=create&amp;refpage='.$env{'form.refpage'}.'">'.$lt{'crng'}.'</a>');
@@ -324,7 +332,8 @@ END
                         $action eq 'reenable') {
                         $link .= $group;
                     } else {
-                        $link .= $group.'/smppg?ref=grouplist';
+                        $link .= 
+                            &Apache::longroup::get_group_link($cdom,$cnum,$group,$navmap).'&amp;ref=grouplist';
                         if (exists($env{'form.refpage'})) {
                             $link .= '&amp;refpage='.$env{'form.refpage'};
                         }
@@ -386,12 +395,23 @@ END
             $r->print('<br /><br />');
             my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
             if (%curr_groups) {
+                my $navmap=Apache::lonnavmaps::navmap->new();
+                if (!defined($navmap)) {
+                    $r->print('<div class="LC_error">'.
+                              &mt('An error occurred retrieving information about resources in the course.').'<br />'.
+                              &mt('It is recommended that you [_1]re-initialize the course[_2] and then return to this page.','<a href="/adm/roles?selectrole=1&newrole='.$env{'request.role'}.'&orgurl=%2fadm%2fcoursegroups">','</a>').
+                              '</div>');
+                    return;
+                }
                 foreach my $group (@coursegroups) {
                     my %group_info =  &Apache::longroup::get_group_settings(
                                         $curr_groups{$group});
                     my $description = &unescape(
                                         $group_info{description});
-                    $r->print('<font size="+1"><a href="/adm/'.$cdom.'/'.$cnum.'/'.$group.'/smppg?ref=grouplist">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');
+                    my $link = 
+                        &Apache::longroup::get_group_link($cdom,$cnum,$group,$navmap).
+                        '&amp;ref=grouplist';
+                    $r->print('<span style="font-size: larger"><a href="'.$link.'">'.$group,'</a></span><br /><small>'.$description.'</small><br /><br />');
                 }
             }
         } else {
@@ -1210,9 +1230,9 @@ sub delete_group {
         if ($result eq 'ok') {
             my $outcome = &modify_folders($cdom,$cnum,$groupname,$crstype);
             if ($outcome eq '') {
-                $r->print('<div class="LC_success">'
-                         .&mt('Group successfully deleted.')
-                         .'</div>');
+                my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Group successfully deleted.'));
+                $message = &Apache::loncommon::confirmwrapper($message);
+                $r->print($message);
             } else {
                 $r->print('<div class="LC_error">');
                 if ($crstype eq 'Community') {
@@ -1223,9 +1243,9 @@ sub delete_group {
                 $r->print('</div>');
             }
         } else {
-            $r->print('<div class="LC_error">'
-                     .&mt('Group deletion failed.')
-                     .'</div>');
+            my $msg = &Apache::lonhtmlcommon::confirm_success(&mt('Group deletion failed.'),1);
+            $msg = &Apache::loncommon::confirmwrapper($msg);
+            $r->print($msg);
         }
     }
     return;
@@ -1437,9 +1457,9 @@ $context) eq 'ok') {
         }
         my $outcome = &reenable_folder($cdom,$cnum,$groupname,$description,$crstype);
         if ($outcome eq '') {
-            $r->print('<div class="LC_success">'
-                     .&mt('Group successfully re-enabled.')
-                     .'</div>');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Group successfully re-enabled.'));
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
         } else {
             $r->print('<div class="LC_error">');
             if ($crstype eq 'Community') {
@@ -1450,9 +1470,9 @@ $context) eq 'ok') {
             $r->print('</div>');
         }
     } else {
-        $r->print('<div class="LC_error">'
-                 .&mt('Re-enabling group failed.')
-                 .'</div>');
+        my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling group failed.'),1);
+        $message = &Apache::loncommon::confirmwrapper($message);
+        $r->print($message);
     }
     return;
 }
@@ -1774,7 +1794,6 @@ sub membership_options {
                 'picr' => 'Pick the criteria to use to build a list of course users from which you will select members of the new group.',
                 'pica' => 'Pick the criteria to use to build a list of course users from which you will select additional members of the group.',
                 'ifno' => 'If you do not wish to add members when you first create the group, there is no need to pick any criteria.', 
-                'asub' => 'A subsequent step will also allow you to specify automatic adding/dropping of group members triggered by specified user role and section <i>changes</i> in the course.',
                 'acty' => 'Access types',
                 'coro' => 'Course roles',
                 'cose' => 'Course sections',
@@ -3244,15 +3263,15 @@ sub write_group_data {
                                            $description,$tools,\%groupinfo,
                                            $gpterm,$ucgpterm,$crstype);
             if ($result eq 'ok') {
-                $r->print('<div class="LC_success">'
-                         .&mt($ucgpterm.' [_1] was created.','<i>'.$groupname.'</i>')
-                         .'</div>');
+                my $msg = &Apache::lonhtmlcommon::confirm_success(&mt($ucgpterm.' [_1] was created.','<i>'.$groupname.'</i>'));
+                $msg = &Apache::loncommon::confirmwrapper($msg);
+                $r->print($msg);
             } else {
-                $r->print('<div class="LC_error">'
-                         .&mt('A problem occurred when creating folders for the new '.$gpterm.' [_1]:'
-                             ,'<i>'.$groupname.'</i>')
-                         .'<br />'.$result
-                         .'</div>');
+                my $msg = &Apache::lonhtmlcommon::confirm_success(&mt('A problem occurred when creating folders for the new '.$gpterm.' [_1]:'
+                                                                     ,'<i>'.$groupname.'</i>')
+                                                                     .'<br />'.$result,1);
+                $msg = &Apache::loncommon::confirmwrapper($msg);
+                $r->print($msg);
             }
         } elsif ($action eq 'modify') {
             my (@oldtools,@newtools); 
@@ -3323,9 +3342,9 @@ sub write_group_data {
                     $r->print('<div class="LC_error">'.$error.'</div>');
                 }
             }
-            $r->print('<div class="LC_success">'
-                     .&mt($ucgpterm.' [_1] was updated.','<i>'.$groupname.'</i>')
-                     .'</div>');
+            my $message = &Apache::lonhtmlcommon::confirm_success(&mt($ucgpterm.' [_1] was updated.','<i>'.$groupname.'</i>'));
+            $message = &Apache::loncommon::confirmwrapper($message);
+            $r->print($message);
         }
     } else {
         my %actiontype = (
@@ -3503,12 +3522,13 @@ sub process_membership {
     my $roster_result = &Apache::lonnet::modify_coursegroup_membership($cdom,
                                                        $cnum,\%usersettings);
     if ($num_ok) {
-        foreach my $type (sort(keys(%added))) { 
-            $r->print(&mt('The following users were successfully [_1]',$type));
+        my $msgall ='';
+        foreach my $type (sort(keys(%added))) {
+            my $message = &mt('The following users were successfully [_1]',$type); 
             if (!($type eq 'deleted' || $type eq 'expired')) {   
-                $r->print(&mt(' with the following privileges'));
+                $message .= &mt(' with the following privileges');
             }
-            $r->print(':<br />');
+            $message .= ':<br/>';
             foreach my $user (@{$added{$type}}) {
                 my $privlist = '';
                 if (!($type eq 'deleted' ||  $type eq 'expired')) {
@@ -3524,10 +3544,14 @@ sub process_membership {
                     }
                     $privlist =~ s/, $//;
                 }
-                $r->print($$userdata{$user}[$$idx{fullname}].'&nbsp;-&nbsp;'.$user.$privlist.'<br />');
+                $message .= $$userdata{$user}[$$idx{fullname}].'&nbsp;-&nbsp;'.$user.$privlist.'<br />';
             }
-            $r->print('<br />');
+            $message .= '<br/>';
+            $message = &Apache::lonhtmlcommon::confirm_success($message);
+            $msgall .= $message;
         }
+        $msgall = &Apache::loncommon::confirmwrapper($msgall);
+        $r->print($msgall);
     }
     if ($num_fail) {
         foreach my $type (sort(keys(%failed))) {
@@ -3540,13 +3564,15 @@ sub process_membership {
         }
         $r->print('<br />');
     }
-    if (@unchanged > 0) {
-        $r->print(&mt('No change occurred for the following users:').'<br />');
-        foreach my $user (sort(@unchanged)) {
-            $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.'<br />');
-        }
-        $r->print('<br />');
-    }
+# Is that really needed?
+#
+#    if (@unchanged > 0) {
+#        $r->print(&mt('No change occurred for the following users:').'<br />');
+#        foreach my $user (sort(@unchanged)) {
+#            $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.'<br />');
+#        }
+#        $r->print('<br />');
+#    }
     if ($roster_result eq 'ok') {
         $r->print('<div class="LC_success">'
                  .&mt($ucgpterm.' membership list updated.')