--- loncom/interface/loncoursegroups.pm	2008/12/16 16:44:28	1.84
+++ loncom/interface/loncoursegroups.pm	2009/02/02 13:27:39	1.91
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.84 2008/12/16 16:44:28 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.91 2009/02/02 13:27:39 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,7 +75,7 @@ sub handler {
     my $crstype = &Apache::loncommon::course_type();
 
     my %functions = (
-                      email => 'E-mail',
+                      communication => 'Send Messages', 
                       discussion => 'Discussion Boards',
                       chat => 'Chat',
                       files => 'File Repository',
@@ -349,8 +349,8 @@ END
 			      '<td align="right">'.$quota.'</td>'.
 			      '<td align="right">'.$totalmembers.'</td>'.
 			      '<td align="right">'.
-                                  '<div class="LC_nobreak">'.&mt('Files: [_1]',$totalfiles).'</div>'.
-                                  '<div class="LC_nobreak">'.&mt('Folders: [_1]',$totaldirs).'</div>'.
+                                  '<span class="LC_nobreak">'.&mt('Files: [_1]',$totalfiles).'</span><br />'.
+                                  '<span class="LC_nobreak">'.&mt('Folders: [_1]',$totaldirs).'</span>'.
                                   '</td>'.
 			      '<td align="right">'.$boards.'</td>'.
 			      '<td align="right">'.$diskuse.'</td>'.
@@ -915,11 +915,11 @@ function changeSort(caller) {
                             result => 'Re-enabled'
                           );
     my %navbuttons = &Apache::lonlocal::texthash(
-                             gtns => 'Go to next step',
-                             gtps => 'Go to previous step',
+                             gtns => 'Next',#'Go to next step',
+                             gtps => 'Previous',#'Go to previous step',
                              crgr => 'Create '.$gpterm,
-                             mose => 'Modify settings',
-                             gtpp => 'Go to previous page',
+                             mose => 'Save',#'Modify settings',
+                             gtpp => 'Previous',#'Go to previous page',
                              adme => 'Add members',
     );
     if ((($action eq 'create') || ($action eq 'modify') || ($action eq 'delete') || ($action eq 'reenable')) &&
@@ -1259,12 +1259,18 @@ sub reenable_folder {
 
 sub modify_folders {
     my ($cdom,$cnum,$groupname) = @_;
-    my $outcome;
+    my ($outcome,$groupmap,$groupmapres,$map,$id,$src);
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my $groupmap = '/uploaded/'.$cdom.'/'.$cnum.'/'.'group_folder_'.
+    if (!defined($navmap)) {
+        $outcome = '<div class="LC_error">'.
+                   &mt('Error reading course contents.').' '.
+                   &mt('You need to re-initialize the course.').
+                   '</div>';
+        return $outcome;
+    }
+    $groupmap = '/uploaded/'.$cdom.'/'.$cnum.'/'.'group_folder_'.
                    $groupname.'.sequence';
-    my $groupmapres = $navmap->getResourceByUrl($groupmap);
-    my ($map,$id,$src);
+    $groupmapres = $navmap->getResourceByUrl($groupmap);
     if ($groupmapres) {
         ($map,$id,$src)=&Apache::lonnet::decode_symb($groupmapres->symb());
     }
@@ -1643,7 +1649,7 @@ END
     for (my $i=0; $i<$halfnum; $i++) {
         $r->print('<td><label><input type="checkbox" name="tool" value="'.
                   $allfunctions[$i].'" />&nbsp;'.
-                   $$functions{$allfunctions[$i]}.'</label></td>
+                   &mt($$functions{$allfunctions[$i]}).'</label></td>
                    <td>&nbsp;</td><td>&nbsp;</td>');
     }
     $r->print('<td><input type="button" value="'.&mt('check all').'" '.
@@ -1652,7 +1658,7 @@ END
     for (my $j=$halfnum; $j<@allfunctions; $j++) {
         $r->print('<td><label><input type="checkbox" name="tool" value="'.
                   $allfunctions[$j].'" />&nbsp;'.
-                  $$functions{$allfunctions[$j]}.'</label></td>
+                  &mt($$functions{$allfunctions[$j]}).'</label></td>
                   <td>&nbsp;</td><td>&nbsp;</td>');
     }
     if ($remnum) {
@@ -1798,7 +1804,7 @@ sub sections_selection {
         }
     }
     my $output = '
-        <select name="'.$elementname.'" multiple="true" size="'.$numvisible.'">
+        <select name="'.$elementname.'" multiple="multiple" size="'.$numvisible.'">
           '.$section_sel.'
         </select>';
     return $output;
@@ -2293,8 +2299,12 @@ sub default_privileges {
     );
     $r->print(&Apache::lonhtmlcommon::start_pick_box('LC_group_priv_box').
 	      &Apache::lonhtmlcommon::row_title($lt{'func'},undef,
-						'LC_groups_functionality'));
-    $r->print(join('</td><td class="LC_groups_functionality">',@{$tools}));
+     						'LC_groups_functionality'));
+    my @printtool = @{$tools};
+    foreach my $printtool (@printtool){
+	$printtool = &mt($printtool);
+    }
+    $r->print(join('</td><td class="LC_groups_functionality">', @printtool));
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
     my $fixed = '';
     my $dynamic = '';
@@ -2310,7 +2320,7 @@ sub default_privileges {
 		    $fixed .= '</td><td class="LC_groups_fixed">';
 		}
                 $fixed .= '<input type="hidden" name="defpriv" value="'.$priv.'" />'
-                         .'<span class="LC_nobreak">'.$$toolprivs{$tool}{$priv}.'&nbsp;';
+                         .'<span class="LC_nobreak">'.&mt($$toolprivs{$tool}{$priv}).'&nbsp;';
                 if ($action eq 'modify') {
                     if (grep(/^$tool$/,@{$available})) {
                         $fixed .= '<small>'.&mt('(on)').'<small>&nbsp;';
@@ -2325,7 +2335,7 @@ sub default_privileges {
                     $dynamic .= '</tr>
                                  <tr>'."\n";
                 }
-                $dynamic .= '<td><span class="LC_nobreak"><label><input type="checkbox" name="defpriv" value="'.$priv.'" />'.$$toolprivs{$tool}{$priv}.'</label></span></td>'."\n";
+                $dynamic .= '<td><span class="LC_nobreak"><label><input type="checkbox" name="defpriv" value="'.$priv.'" />'.&mt($$toolprivs{$tool}{$priv}).'</label></span></td>'."\n";
             }
         }
         if ($privcount == 0) {
@@ -3222,36 +3232,49 @@ sub write_group_data {
                 my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/';
                 my $boardsmap = $crspath.'group_boards_'.$groupname.'.sequence';
                 my $navmap = Apache::lonnavmaps::navmap->new();
-                my $bbmapres = $navmap->getResourceByUrl($boardsmap);
-                undef($navmap);
-                if (!$bbmapres) {
-                    my $grpmap = $crspath.'group_folder_'.$groupname.'.sequence';
-                    my $disctitle = &mt('Discussion Boards');
-                    my $outcome = &map_updater($cdom,$cnum,'group_boards_'.
-                                               $groupname.'.sequence','bbseq',
-                                               $disctitle,$grpmap);
-                    my ($furl,$ferr) = 
-                        &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
-                    $navmap = Apache::lonnavmaps::navmap->new();
-                    # modify parameter
-                    if ($outcome eq 'ok') {
-                        my $parm_result = &parm_setter($navmap,$cdom,$boardsmap,
-                                                       $groupname);
-                        if ($parm_result) {
-                            $r->print('<div class="LC_error">'
-                                     .&mt('An error occurred while setting parameters '
-                                         .'for Discussion Boards folder: '
-                                         .'[_1]',$parm_result)
-                                     .'</div>');
+                my ($bbmapres,$error);
+                if (defined($navmap)) {
+                    $bbmapres = $navmap->getResourceByUrl($boardsmap);
+                    undef($navmap);
+                    if (!$bbmapres) {
+                        my $grpmap = $crspath.'group_folder_'.$groupname.'.sequence';
+                        my $disctitle = &mt('Discussion Boards');
+                        my $outcome = &map_updater($cdom,$cnum,'group_boards_'.
+                                                   $groupname.'.sequence','bbseq',
+                                                   $disctitle,$grpmap);
+                        my ($furl,$ferr) = 
+                            &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+                        # modify parameter
+                        if ($outcome eq 'ok') {
+                            $navmap = Apache::lonnavmaps::navmap->new();
+                            if (defined($navmap)) {
+                                my $parm_result = &parm_setter($navmap,$cdom,$boardsmap,
+                                                               $groupname);
+                                if ($parm_result) {
+                                    $error = &mt('An error occurred while setting parameters '
+                                             .'for Discussion Boards folder: '
+                                             .'[_1]',$parm_result);
+                                } else {
+                                    $r->print('<div class="LC_success">'.
+                                              &mt('Discussion Boards Folder created.')
+                                              .'</div>');
+                                }
+                                undef($navmap);
+                            } else {
+                                $error = &mt('An error occurred while setting parameters '.
+                                             'for Discussion Boards folder: '.
+                                             'Could not retrieve course information' );
+                            }
                         } else {
-                            $r->print('<div class="LC_success">'
-                                     .&mt('Discussion Boards Folder created.')
-                                     .'</div>');
+                            $r->print($outcome);
                         }
-                    } else {
-                        $r->print($outcome);
                     }
-                    undef($navmap);
+                } else {
+                    $error = &mt("An error occurred while retrieving the contents of the group's folder.").'<br />'.
+                             &mt('You need to re-initialize the course.');
+                }
+                if ($error ne '') {
+                    $r->print('<div class="LC_error">'.$error.'</div>');
                 }
             }
             $r->print('<div class="LC_success">'
@@ -3827,6 +3850,10 @@ sub add_group_folder {
     }
     my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
     my $navmap = Apache::lonnavmaps::navmap->new();
+    if (!defined($navmap)) {
+        return $warning.'<span class="LC_error">'.&mt('Error retrieving course contents').
+               ' '.&mt('You need to re-initialize the course.').'</span>';
+    }
     # modify parameters
     my $parm_result;
     if ($action eq 'create') {
@@ -3932,6 +3959,13 @@ sub new_map {
 sub parm_setter {
     my ($navmap,$cdom,$url,$groupname) = @_;
     my $allresults;
+    if (!defined($navmap)) {
+        $allresults = '<div class="LC_warning">'.
+                      &mt('Parameters not set for [_1] because the contents of the course could not be retrieved.',$url).' '.
+                      &mt('You need to reinitialize the course.').
+                      '</div>';
+        return $allresults;
+    }
     my %hide_settings = (
                            'course' =>  {
                                           'num' => 13,