--- loncom/interface/loncoursegroups.pm	2008/12/24 07:36:39	1.80.2.4
+++ loncom/interface/loncoursegroups.pm	2008/12/16 19:33:36	1.85
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.80.2.4 2008/12/24 07:36:39 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.85 2008/12/16 19:33:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,10 +76,10 @@ sub handler {
 
     my %functions = (
                       email => 'E-mail',
-                      discussion => 'Discussion boards',
+                      discussion => 'Discussion Boards',
                       chat => 'Chat',
-                      files => 'File repository',
-                      roster => 'Membership roster',
+                      files => 'File Repository',
+                      roster => 'Membership Roster',
                       homepage => $ucgpterm.' home page',
                     );
 
@@ -349,8 +349,8 @@ END
 			      '<td align="right">'.$quota.'</td>'.
 			      '<td align="right">'.$totalmembers.'</td>'.
 			      '<td align="right">'.
-                                  '<span class="LC_nobreak">'.&mt('Files: [_1]',$totalfiles).'</span><br />'.
-                                  '<span class="LC_nobreak">'.&mt('Folders: [_1]',$totaldirs).'</span>'.
+                                  '<div class="LC_nobreak">'.&mt('Files: [_1]',$totalfiles).'</div>'.
+                                  '<div class="LC_nobreak">'.&mt('Folders: [_1]',$totaldirs).'</div>'.
                                   '</td>'.
 			      '<td align="right">'.$boards.'</td>'.
 			      '<td align="right">'.$diskuse.'</td>'.
@@ -1674,8 +1674,8 @@ END
        <td class="LC_description">'.&mt('Granularity:').'</td>
        <td colspan="10">'.$lt{'doyo'}.'&nbsp;<label><input type="radio" name="granularity" value="Yes" />'.&mt('Yes').'</label>&nbsp;<label><input type="radio" name="granularity" value="No" checked="checked" />'.&mt('No').'</label>');
     if ($action eq 'modify') {
-        $r->print('&nbsp;&nbsp;('.&mt('Currently set to "[_1]"',
-                                      &mt($$stored{'granularity'})).')');
+        $r->print('&nbsp;&nbsp;('.&mt('Currently set to [_1].'
+                                      ,'"'.&mt($$stored{'granularity'}).'"').')');
     }
     $r->print('
        </td>
@@ -3238,7 +3238,7 @@ sub write_group_data {
                         my $outcome = &map_updater($cdom,$cnum,'group_boards_'.
                                                    $groupname.'.sequence','bbseq',
                                                    $disctitle,$grpmap);
-                        my ($furl,$ferr) =
+                        my ($furl,$ferr) = 
                             &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
                         # modify parameter
                         if ($outcome eq 'ok') {
@@ -3528,7 +3528,6 @@ sub mapping_options {
         'adds'  => "If automatic $gpterm enrollment is enabled, when a user is newly assigned a ".lc($crstype)."-wide or section-specific role, he/she will automatically be added as a member of the $gpterm, with start and end access dates defined by the default dates set for the $gpterm, unless he/she is already a $gpterm member, with access dates that permit either current or future $gpterm access.",
         'drops'  => "If automatic $gpterm disenrollment is enabled, when a user's role is expired, access to the $gpterm will be terminated unless the user continues to have other ".lc($crstype)."-wide or section-specific active or future roles which receive automatic membership in the $gpterm.",
         'pirs' => "Pick roles and sections for automatic $gpterm enrollment",
-        'curr' => 'Currently set to',
         'on' => 'on',
         'off' => 'off',
         'auad' => "Automatically enable $gpterm membership when roles are added?",
@@ -3556,14 +3555,14 @@ sub automapping {
    <span class="LC_nobreak">'.$$lt{'auad'}.':&nbsp;
     <label><input type="radio" name="autoadd" value="on" />'.&mt('on').'&nbsp;&nbsp;</label><label><input type="radio" name="autoadd" value="off" checked="checked" />'.&mt('off').'</label>');
     if ($action eq 'modify') {
-        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$add}.'</b>)');
+        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.&mt('Currently set to [_1].','<b>'.$$lt{$add}.'</b>').')');
     }
     $r->print('
     </span><br />
     <span class="LC_nobreak">'.$$lt{'auex'}.':&nbsp;
     <label><input type="radio" name="autodrop" value="on" />'.&mt('on').'&nbsp;&nbsp;</label><label><input type="radio" name="autodrop" value="off" checked="checked" />'.&mt('off').'</label>');
     if ($action eq 'modify') {
-        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$drop}.'</b>)');
+        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.&mt('Currently set to [_1].','<b>'.$$lt{$drop}.'</b>').')');
     }
     $r->print('</span><br /><br />'.$$lt{'mapr'});
 }
@@ -3957,11 +3956,8 @@ 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;
+        $allresults = &mt('Parameters not set for [_1] because the contents of the course could not be retrieved.',$url).' '.
+                      &mt('You need to reinitialize the course.').'<br />';
     }
     my %hide_settings = (
                            'course' =>  {