--- loncom/interface/loncoursegroups.pm	2010/01/26 03:26:02	1.101.4.2
+++ loncom/interface/loncoursegroups.pm	2014/12/11 01:19:07	1.127
@@ -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.127 2014/12/11 01:19:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ use strict;
 use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
+use Apache::lonhtmlgateway;
 use Apache::lonlocal;
 use Apache::lonnavmaps();
 use Apache::longroup();
@@ -135,7 +136,7 @@ function changeSort(caller) {
 function openGroupRoster(group,status) {
     var url = '/adm/grouproster?';
     url += 'group='+group+'&status='+status+'&ref=popup';
-    var title = 'Group Membership';
+    var title = 'Group_Membership';
     var options = 'scrollbars=1,resizable=1,menubar=0';
     options += ',width=700,height=600';
     rosterbrowser = open(url,title,options,'1');
@@ -170,7 +171,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='.
@@ -188,7 +189,7 @@ sub display_groups {
                           crtd   => 'Created',
                           last   => 'Last Modified',
                           func   => 'Collaborative Tools',
-                          quot   => 'Quota (Mb)',
+                          quot   => 'Quota (MB)',
                           memb   => 'Members',
                           file   => 'Files',
                           dibd   => 'Discussion Boards',
@@ -221,6 +222,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 +333,9 @@ END
                         $action eq 'reenable') {
                         $link .= $group;
                     } else {
-                        $link .= $group.'/smppg?ref=grouplist';
+                        $link .= 
+                            &Apache::longroup::get_group_link($cdom,$cnum,$group,$navmap);
+                        $link .= (($link=~/\?/)?'&amp;':'?').'ref=grouplist';
                         if (exists($env{'form.refpage'})) {
                             $link .= '&amp;refpage='.$env{'form.refpage'};
                         }
@@ -386,16 +397,32 @@ 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 {
-            $r->print(&mt('You are not currently a member of any active '.$gpterm.'s in this '.lc($crstype).'.'));
+            $r->print(
+                '<p class="LC_info">'
+               .&mt('You are not currently a member of any active '.$gpterm.'s'
+                   .' in this '.lc($crstype).'.')
+               .'</p>'
+            );
         }
     }
     return;
@@ -785,7 +812,7 @@ sub group_administration {
     }
     var maxposs = '.sprintf("%.2f",$maxposs).';
     if (newquota > maxposs) {
-        alert("The group portfolio quota you entered for this group ("+newquota+" Mb) exceeds the maximum possible ("+maxposs+" Mb). Please enter a smaller number.");
+        alert("The group portfolio quota you entered for this group ("+newquota+" MB) exceeds the maximum possible ("+maxposs+" MB). Please enter a smaller number.");
         return;
     }
     var re_quota = '.$float_check.';
@@ -804,7 +831,7 @@ sub group_administration {
             }
         }
         if (warn_zero == 1) {
-            alert("You have indicated that the group portfolio should be enabled, but you have set the respository quota to 0 Mb.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature.");
+            alert("You have indicated that the group portfolio should be enabled, but you have set the repository quota to 0 MB.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature.");
             return;
         }
     } 
@@ -1129,7 +1156,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);
         }
     }
 }
@@ -1210,9 +1237,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 +1250,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;
@@ -1255,7 +1282,7 @@ sub reenable_folder {
         $LONCAPA::map::resources[$idx] = $foldertitle.':'.$mapurl.
                                          ':false:normal:res';
         $LONCAPA::map::order[1+$#LONCAPA::map::order]=$idx;
-        my ($outtext,$errtext) = &LONCAPA::map::storemap($allgrpsmap,1);
+        my ($outtext,$errtext) = &LONCAPA::map::storemap($allgrpsmap,1,1);
         if ($errtext) {
             $outcome='<div class="LC_error">'
                     .&mt('An error occurred when saving updated parent folder to group:'
@@ -1320,7 +1347,7 @@ sub modify_folders {
                     $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1];
                 }
                 $#LONCAPA::map::order--;
-                my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1);
+                my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1,1);
                 if ($errtext) {
                     $outcome='<div class="LC_error">'
                             .&mt('An error occurred when saving updated parent folder to group:')
@@ -1437,9 +1464,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 +1477,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;
 }
@@ -1466,7 +1493,7 @@ sub header {
 				       {'add_entries' => $loaditems,});
     my $output = <<"END";
 $start_page
-<form method="post" name="$state">
+<form method="post" name="$state" action="">
 
 END
     if ($action eq 'create' || $action eq 'modify') {
@@ -1526,16 +1553,19 @@ sub build_members_list {
 sub group_files {
     my ($group,$portpath,$numfiles,$numdirs) = @_;
     my $dirptr=16384;
-    my @dir_list=&Apache::portfolio::get_dir_list($portpath,undef,$group);
-    foreach my $line (@dir_list) {
-        my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
-        if (($filename !~ /^\.\.?$/) && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/) && ($filename ne 'no_such_dir')) { 
-            if ($dirptr&$testdir) {
-                $portpath .= '/'.$filename;
-                $$numdirs ++;
-                &group_files($group,$portpath,$numfiles,$numdirs)
-            } else {
-                $$numfiles ++;
+    my ($dirlistref,$listerror) = 
+        &Apache::portfolio::get_dir_list($portpath,undef,$group);
+    if (ref($dirlistref) eq 'ARRAY') {
+        foreach my $line (@{$dirlistref}) {
+            my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
+            if (($filename !~ /^\.\.?$/) && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/) && ($filename ne 'no_such_dir')) { 
+                if ($dirptr&$testdir) {
+                    $portpath .= '/'.$filename;
+                    $$numdirs ++;
+                    &group_files($group,$portpath,$numfiles,$numdirs)
+                } else {
+                    $$numfiles ++;
+                }
             }
         }
     }
@@ -1557,7 +1587,7 @@ sub group_members {
                          future => 0,
                        );
     my $totalmembers = 0;
-    foreach my $member (keys %memberhash) {
+    foreach my $member (keys(%memberhash)) {
         $totalmembers ++;
         my ($end,$start) = split(/:/,$memberhash{$member});
         unless ($start == -1) {
@@ -1605,7 +1635,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 = ();
@@ -1672,7 +1702,7 @@ sub groupsettings_options {
     if ($remnum) {
         $halfnum ++;
     }
-    my @allfunctions = sort(keys (%{$functions}));
+    my @allfunctions = sort(keys(%{$functions}));
 
     $r->print(&Apache::lonhtmlcommon::row_title($lt{'func'})
              .'<div>'
@@ -1727,19 +1757,19 @@ sub groupsettings_options {
     } else {
         $r->print(&mt('Quota allocated to group portfolio:'));
     } 
-    $r->print(' '.&mt('[_1] Mb','<input type="text" name="quota" size="4" />'));
+    $r->print(' '.&mt('[_1] MB','<input type="text" name="quota" size="4" />'));
     if ($action eq 'create') {
         $r->print('<br />'
-                 .&mt('A total of [_1] Mb can be divided amongst all '.$gpterm.'s in the '
-                     .lc($crstype).', and [_2] Mb are currently unallocated.'
+                 .&mt('A total of [_1] MB can be divided amongst all '.$gpterm.'s in the '
+                     .lc($crstype).', and [_2] MB are currently unallocated.'
                      ,$crsquota,sprintf("%.2f",$freespace))
                  );
     } else {
-        $r->print('&nbsp;&nbsp;('.&mt('The quota is currently [_1] Mb',
+        $r->print('&nbsp;&nbsp;('.&mt('The quota is currently [_1] MB',
                                       $$stored{'quota'}).').');
 
         $r->print('<br />'
-                 .&mt('The quota can be increased to [_1] Mb, '
+                 .&mt('The quota can be increased to [_1] MB, '
                  .'by adding all unallocated space for '.$gpterm.'s in the '.lc($crstype).'.'
                   ,sprintf("%.2f",$maxposs)));
     }
@@ -1786,7 +1816,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 +1834,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 {
@@ -1989,10 +2017,10 @@ sub print_current_settings {
         dfac => 'Default access dates',
         ygrs => "Your group selections - ",
         tfwa => "The following settings will apply to the group:",
-        difn => 'Different collaborative tools<br />for different members:',
         stda => 'Start date:',
         enda => 'End date:',
     );
+    $lt{'difn'} = &mt('Different collaborative tools[_1]for different members:','<br />');
     my $showstart = &Apache::lonlocal::locallocaltime($startdate);
     my $showend;
     if ($enddate == 0) {
@@ -2042,7 +2070,7 @@ sub print_current_settings {
         $r->print('</ul>');
     }
 
-    my $quota_text=&mt('[_1] Mb',$quota);
+    my $quota_text=&mt('[_1] MB',$quota);
     my $granu_text=&mt($granularity);
     $r->print(<<"END");
   </td>
@@ -2104,7 +2132,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.')" />
@@ -2232,11 +2260,12 @@ sub privilege_specificity {
                 "for users who receive specific sections/roles in the course ",
       'asyo' => "As you have chosen not to include any collaborative tools ".
                 "in the group, no default optional privileges need to be set.",
-      'plin' => 'Indicate which <b>optional</b> privileges members '.
                 'will receive by default for a specific tool.',
       'oppr' => 'Optional privileges',
       'defp' => 'The default privileges new members will receive are:', 
     );
+    $lt{'plin'} = &mt('Indicate which [_1]optional[_2] privileges members '.
+                      'will receive by default for a specific tool.','<b>','</b>');
     if ($crstype eq 'Community') {
         $lt{'thes'} = &mt('These will be the privileges given to members assigned in the future via automatic group assignment for users who receive specific sections/roles in the community '); 
     }
@@ -2520,6 +2549,7 @@ sub current_membership {
                                           'actn' => 'Action?',
                                           'name' => 'Name',
                                           'usnm' => 'Username',
+                                          'stid' => 'ID',
                                           'doma' => 'Domain',
                                           'stda' => 'Start Date',
                                           'enda' => 'End Date',
@@ -2557,7 +2587,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;
@@ -2581,7 +2611,7 @@ END
      <th><a href="javascript:changeSort('fullname')">$lt{'name'}</a></th>
      <th><a href="javascript:changeSort('username')">$lt{'usnm'}</a></th>
      <th><a href="javascript:changeSort('domain')">$lt{'doma'}</a></th>
-     <th><a href="javascript:changeSort('id')">ID</a></th>
+     <th><a href="javascript:changeSort('id')">$lt{'ID'}</a></th>
      <th><a href="javascript:changeSort('start')">$lt{'stda'}</a></th>
      <th><a href="javascript:changeSort('end')">$lt{'enda'}</a></th>
 END
@@ -2705,7 +2735,10 @@ END
         }
         $r->print(&Apache::loncommon::end_data_table());
     } else {
-        $r->print(&mt('There are no active, future or previous group members to modify.'));
+        $r->print(
+            '<p class="LC_info">'
+           .&mt('There are no active, future or previous group members to modify.')
+           .'</p>');
     }
     return $numcurrent;
 }
@@ -2715,7 +2748,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.')" />
@@ -2773,7 +2806,7 @@ sub change_privs_form {
         }
     }
     if (!$exp_or_del) {
-        $r->print($lt{'nome'}.'<br />');
+        $r->print('<p class="LC_info">'.$lt{'nome'}.'</p>');
     }
     
     $r->print(&Apache::lonhtmlcommon::topic_bar(4,&mt('Setting optional privileges for specific group members')));
@@ -2795,7 +2828,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 +3048,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.')" />'
@@ -3169,7 +3202,7 @@ sub write_group_data {
         $quota = 0;
         $r->print('<div class="LC_warning">'
                  .&mt('The value you entered for the quota for the group portfolio in this '.$gpterm
-                 .' contained invalid characters, so it has been set to 0 Mb. You can change this by'
+                 .' contained invalid characters, so it has been set to 0 MB. You can change this by'
                  .' modifying the '.$gpterm.' settings.')
                  .'</div>');
     }
@@ -3177,7 +3210,7 @@ sub write_group_data {
         $quota = $maxposs;
         $r->print('<div class="LC_warning">'
                  .&mt('The value you entered for the quota for the group portfolio in this '.$gpterm
-                 .' exceeded the maximum possible value, so it has been set to [_1] Mb '
+                 .' exceeded the maximum possible value, so it has been set to [_1] MB '
                  .'(the maximum possible value).',sprintf("%.2f",$maxposs))
                  .'</div>');
     }
@@ -3245,15 +3278,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); 
@@ -3299,8 +3332,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: '.
@@ -3324,9 +3357,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 = (
@@ -3336,10 +3369,10 @@ sub write_group_data {
         &Apache::lonnet::logthis("Failed to store $gpterm $groupname ".
                                  'in '.lc($crstype).': '.$cnum.
                                  ' in domain: '.$cdom);
-        $r->print('<div class="LC_error">'
-                 .&mt('An error occurred when [_1] the '.$gpterm.'. '
-                 .'Please try again.',$actiontype{$action})
-                 .'</div>');
+        $r->print('<p class="LC_error">'
+                 .&mt('An error occurred when '.$actiontype{$action}.' the '.$gpterm.'. '
+                 .'Please try again.')
+                 .'</p');
     }
     return $result;
 }
@@ -3470,7 +3503,7 @@ sub process_membership {
                 if (grep/^$user$/,@reenable) {
                     $start = $startdate;
                     $end = $enddate;
-                    $type = 'reenabled';
+                    $type = 're-enabled';
                 }
             }
             if ($type eq '') {
@@ -3504,12 +3537,14 @@ 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;
+            my $tmsg = "The following users were successfully $type"; 
             if (!($type eq 'deleted' || $type eq 'expired')) {   
-                $r->print(&mt(' with the following privileges'));
+                $tmsg .= ' with the following privileges';
             }
-            $r->print(':<br />');
+            $message .= &mt($tmsg.':').'<br/>';
             foreach my $user (@{$added{$type}}) {
                 my $privlist = '';
                 if (!($type eq 'deleted' ||  $type eq 'expired')) {
@@ -3525,10 +3560,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))) {
@@ -3541,13 +3580,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.')
@@ -3555,8 +3596,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 +3752,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;
 }
 
@@ -4008,7 +4045,7 @@ sub map_updater {
         $LONCAPA::map::resources[$newidx] = $itemtitle.':'.$newmapurl.
                                                  ':false:normal:res';
         $LONCAPA::map::order[1+$#LONCAPA::map::order]=$newidx;
-        my ($outtext,$errtext) = &LONCAPA::map::storemap($parentmap,1);
+        my ($outtext,$errtext) = &LONCAPA::map::storemap($parentmap,1,1);
         if ($errtext) {
             $outcome = '<div class="LC_error">'
                       .&mt('Error saving updated parent folder.')." ($parentmap):  $errtext"
@@ -4089,10 +4126,9 @@ sub create_homepage {
     my ($cdom,$cnum,$name,$groupinfo,$tools,$gpterm,$ucgpterm,$now) = @_;
     my $functionality = join(',',@{$tools});
     my $content = &unescape($$groupinfo{description});
-    $content=~s/\s+$//s;
-    $content=~s/^\s+//s;
-    $content=~s/\<br\s*\/*\>$//s;
-    $content=&Apache::lonfeedback::clear_out_html($content,1);
+    chomp($content);
+    my $gateway = Apache::lonhtmlgateway->new();
+    $content = $gateway->process_incoming_html($content,1);
 
     my %pageinfo = (
                      'aaa_title' => "$ucgpterm: $name",
@@ -4152,43 +4188,40 @@ sub validate_groupname {
     }
     my %lt = &Apache::lonlocal::texthash (
                       igna => "Invalid $gpterm name",
-                      tgne => "The $gpterm name entered ",
                       grna => "$ucgpterm names and section names used in a ".
                                "$crstype must be unique.",
-                      isno => "is not a valid name.",
                       gnmo => "$ucgpterm names may only contain letters, ". 
                               "numbers or underscores.",
-                      cnnb => "can not be used as it is the name of ",
-                      inth => " in this $crstype", 
-                      thgr => "- does not correspond to the name of an ".
-                              "existing $gpterm",    
     );
 
-    my $exitmsg = '<span class="LC_error">'.$lt{'igna'}.'</span><br /><br />'.
-	$lt{'tgne'}.' "'.$groupname.'" ';
-    my $dupmsg = $lt{'grna'};
-    my $earlyout;
+    my $exitmsg = '<span class="LC_error">'.$lt{'igna'}.'</span><br /><br />';
+    my $nameshown = &Apache::loncommon::cleanup_html($groupname);
     if (($groupname eq '') || ($groupname =~ /\W/)) {
-        $earlyout = $exitmsg.$lt{'isno'}.'<br />'.$lt{'gnmo'};
-        return $earlyout;
+        return $exitmsg.
+               &mt("The $gpterm name entered '[_1]' is not a valid name.",$nameshown).
+               '<br />'.$lt{'gnmo'};
+    } elsif ($groupname eq 'syllabus') {
+        return $exitmsg.
+               &mt("The $gpterm name entered '[_1]' is reserved for use by LON-CAPA.",$nameshown);
     }
     if (exists($sectioncount{$groupname})) {
-	return $exitmsg.$lt{'cnnb'}.&mt('a section').$lt{'inth'}.
-	    '<br />'.$lt{'grna'};
+	return  $exitmsg.
+                &mt("The $gpterm name entered '[_1]' can not be used as it is the name of a section in this $crstype.",$nameshown).
+	        '<br />'.$lt{'grna'};
     }
     if ($action eq 'create') { 
 	if (exists($curr_groups{$groupname})) {
-	    return $exitmsg.$lt{'cnnb'}.&mt('an existing [_1]',$gpterm).
-	           $lt{'inth'}.'.<br />'.$lt{'grna'};
+	    return $exitmsg.
+                   &mt("The $gpterm name entered '[_1]' can not be used as it is the name of an existing $gpterm in this $crstype.",$nameshown).
+                  '<br />'.$lt{'grna'};
         } elsif (exists($deleted_groups{$groupname})) {
-            return $exitmsg.$lt{'cnnb'}.&mt('a [_1] which previously existed',$gpterm).
-                   $lt{'inth'}.'.<br />'.$lt{'grna'};
+            return $exitmsg.
+                   &mt("The $gpterm name entered '[_1]' can not be used as it is the name of a $gpterm which previously existed in this $crstype.",$nameshown).
+                   '<br />'.$lt{'grna'};
         }
     } elsif ($action eq 'modify') {
         unless(exists($curr_groups{$groupname})) {
-            $earlyout = &mt('[_1] name:',$ucgpterm).' '.$groupname.$lt{'thgr'}.
-                        $lt{'inth'};
-            return $earlyout;
+            return &mt("$ucgpterm name: [_1] does not correspond to the name of an existing $gpterm in this $crstype.",$nameshown);
         }
     }
     return;
@@ -4233,3 +4266,4 @@ sub check_changes {
 }
 
 1;
+