--- loncom/interface/loncoursegroups.pm	2010/01/26 03:26:02	1.101.4.2
+++ loncom/interface/loncoursegroups.pm	2010/01/26 02:40:32	1.108
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.101.4.2 2010/01/26 03:26:02 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.108 2010/01/26 02:40:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1129,7 +1129,7 @@ sub display_control {
             &verify_reenable($r,$groupname,$state,$action,$page,$states,
                            \%stored,$crstype);
         } elsif ($state eq 'result') {
-            &reenable_group($r,$cdom,$cnum,$groupname);
+            &reenable_group($r,$cdom,$cnum,$groupname,$crstype);
         }
     }
 }
@@ -1605,7 +1605,7 @@ sub general_settings_form {
     &access_date_settings($r,$action,$formname,$stored,2,$gpterm,$ucgpterm);
     if ($action eq 'create') {
         &membership_options($r,$cdom,$cnum,$action,$formname,$sectioncount,3,
-                            $gpterm,$ucgpterm);
+                            $gpterm,$ucgpterm,$crstype);
         $nexttext = $$navbuttons{'gtns'};
     } else {
         my @available = ();
@@ -1786,7 +1786,6 @@ sub membership_options {
     } else {
         $lt{'asub'} = &mt('A subsequent step will also allow you to specify automatic adding/dropping of group members triggered by specified user role and section [_1]changes[_2] in the course.','<i>','</i>');
     }
-
     my %status_types = (
                    active => &mt('Currently has access'),
                    previous => &mt('Previously had access'),
@@ -1805,7 +1804,6 @@ sub membership_options {
 
     $r->print(&Apache::lonhtmlcommon::topic_bar($image,$lt{'pipa'}).'
      <b>'.$lt{'gmem'}.'</b><br />');
-
     if ($action eq 'create') {
         $r->print($lt{'picr'}.'<br />'.$lt{'ifno'}.'<br />'.$lt{'asub'});
     } else {
@@ -2104,7 +2102,7 @@ sub pick_new_members {
         &check_uncheck_buttons($r,$formname,'member',$lt{'addm'});
         if (@{$available} > 0 && $granularity eq 'Yes') {
             $r->print('<td>
-     <fieldset><legend><b>'.$lt{'setf'}.'</b></legend>
+     <fieldset><legend>'.$lt{'setf'}.'</legend>
       <span class="LC_nobreak">
       <input type="button" value="'.&mt('check all').'"
         onclick="javascript:checkAllTools(document.'.$formname.')" />
@@ -2557,7 +2555,7 @@ sub current_membership {
                 $r->print('
      <td>
       <span class="LC_nobreak">
-       <fieldset><legend><b>'.$lt{'curf'}.'</b></legend>
+       <fieldset><legend>'.$lt{'curf'}.'</legend>
        <input type="button" value="'.&mt('check all').'"
        onclick="javascript:checkAllTools(document.'.$formname.')" />
        &nbsp;&nbsp;
@@ -2715,7 +2713,7 @@ sub check_uncheck_buttons {
     $r->print('
      <td '.$colspan.'>
        <fieldset>
-       <legend><b>'.$title.'</b></legend>
+       <legend>'.$title.'</legend>
       <span class="LC_nobreak">
        <input type="button" value="'.&mt('check all').'"
        onclick="javascript:checkAll(document.'.$formname.'.'.$field.')" />
@@ -2795,7 +2793,7 @@ sub change_privs_form {
 sub add_members_form {
     my ($r,$cdom,$cnum,$action,$formname,$page,$startdate,$enddate,$groupname,
         $description,$granularity,$quota,$sectioncount,$tools,$functions,
-        $stored,$states,$navbuttons,$gpterm,$ucgpterm,$crstype)=@_; 
+        $stored,$states,$navbuttons,$gpterm,$ucgpterm,$crstype)=@_;
     $r->print(' <br />');
     my @available = ();
     my @unavailable = ();
@@ -3015,7 +3013,7 @@ sub member_privileges_form {
                                     $r->print('<td>');
                                 }
                                 $r->print(
- '<fieldset><legend><b>'.&mt($$toolprivs{$tool}{$priv}).'</b></legend>'
+ '<fieldset><legend>'.&mt($$toolprivs{$tool}{$priv}).'</legend>'
 .'<span class="LC_nobreak">'
 .' <input type="button" value="'.&mt('check all').'"'
 .' onclick="javascript:checkAll(document.'.$formname.'.userpriv_'.$priv.')" />'
@@ -3299,8 +3297,8 @@ sub write_group_data {
                             } else {
                                 if ($crstype eq 'Community') {
                                     $error = &mt("An error occurred while setting parameters '.
-                                              'for Discussion Boards folder: '.
-                                              'Could not retrieve community information");
+                                             'for Discussion Boards folder: '.
+                                             'Could not retrieve community information");
                                 } else {
                                     $error = &mt("An error occurred while setting parameters '.
                                              'for Discussion Boards folder: '.
@@ -3555,8 +3553,8 @@ sub process_membership {
 	$r->print('<p class="LC_info">');
         if ($crstype eq 'Community') {
             $r->print(&mt("Any currently logged in community users affected by the changes you made"
-                      .' to group membership or privileges for the [_1] group will need to log out'
-                      .' and log back in for their LON-CAPA sessions to reflect these changes.'
+                     .' to group membership or privileges for the [_1] group will need to log out'
+                     .' and log back in for their LON-CAPA sessions to reflect these changes.'
                      ,'<i>'.$groupname.'</i>'));
 
         } else {  
@@ -3711,36 +3709,32 @@ sub standard_roles {
 sub modify_menu {
     my ($r,$groupname,$page,$gpterm) = @_;
     my @menu =
-        (
-          { text => "Modify default $gpterm settings",
-            help => 'Course_Modify_Group',
-            state => 'change_settings',
-            branch => 'settings',
+        ( { categorytitle =>'Group Actions',
+	items => [
+
+          { linktext => "Modify default $gpterm settings",
+            url => '/adm/coursegroups?action=modify&refpage='.$env{'form.refpage'}.'&groupname='.$groupname.'&state=change_settings&branch=settings',
+            icon => 'grp_settings.png',
+            alttext => "Modify default $gpterm settings",
+            permission => '1',
+            help => 'Course_Modify_Group',            
             },
-          { text => 'Modify access, tools and/or privileges for previous, '.
-                    'future, or current members',
+          { linktext => 'Modify access, tools and privileges for members',
+            url => '/adm/coursegroups?action=modify&refpage='.$env{'form.refpage'}.'&groupname='.$groupname.'&state=change_members&branch=members',
+            icon => 'grp_tools.png',
+            alttext => 'Modify access, tools and privileges for members',
+            permission => '1',
             help => 'Course_Modify_Group_Membership',
-            state => 'change_members',
-            branch => 'members',
             },
-          { text => "Add member(s) to the $gpterm",
+          { linktext => "Add member(s) to the $gpterm",
+            url => '/adm/coursegroups?action=modify&refpage='.$env{'form.refpage'}.'&groupname='.$groupname.'&state=add_members&branch=adds',
+            icon => 'grp_add.png',
+            alttext =>  "Add member(s) to the $gpterm",
+            permission => '1',
             help => 'Course_Group_Add_Members',
-            state => 'add_members',
-            branch => 'adds',
-            },
-          );
-    my $menu_html = '';
-    foreach my $menu_item (@menu) {
-        $menu_html .=
-        '<p><font size="+1"><a href="/adm/coursegroups?action=modify&refpage='.$env{'form.refpage'}.'&groupname='.$groupname.'&state='.$menu_item->{'state'}.'&branch='.$menu_item->{'branch'}.'">';
-        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
-        if (exists($menu_item->{'help'})) {
-            $menu_html.=
-                &Apache::loncommon::help_open_topic($menu_item->{'help'});
-        }
-        $menu_html.='</p>'.$/;
-    }
-    $r->print($menu_html);
+            }]}
+          );   
+    $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
     return;
 }
 
@@ -4233,3 +4227,4 @@ sub check_changes {
 }
 
 1;
+