--- loncom/interface/loncoursegroups.pm	2008/12/16 23:52:08	1.80.2.3
+++ loncom/interface/loncoursegroups.pm	2008/12/06 12:49:17	1.82
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.80.2.3 2008/12/16 23:52:08 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.82 2008/12/06 12:49:17 bisitz 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',
                     );
 
@@ -1259,18 +1259,12 @@ sub reenable_folder {
 
 sub modify_folders {
     my ($cdom,$cnum,$groupname) = @_;
-    my ($outcome,$groupmap,$groupmapres,$map,$id,$src);
+    my $outcome;
     my $navmap = Apache::lonnavmaps::navmap->new();
-    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_'.
+    my $groupmap = '/uploaded/'.$cdom.'/'.$cnum.'/'.'group_folder_'.
                    $groupname.'.sequence';
-    $groupmapres = $navmap->getResourceByUrl($groupmap);
+    my $groupmapres = $navmap->getResourceByUrl($groupmap);
+    my ($map,$id,$src);
     if ($groupmapres) {
         ($map,$id,$src)=&Apache::lonnet::decode_symb($groupmapres->symb());
     }
@@ -1559,11 +1553,11 @@ sub open_list_window {
     my ($group,$status,$count,$text) = @_;
     my $entry;
     if ($count > 0) {
-        $entry = '<span class="LC_nobreak"><a href="javascript:openGroupRoster('.
+        $entry = '<nobr><a href="javascript:openGroupRoster('.
                  "'$group','$status'".')">'.$text.'</a>&nbsp;-&nbsp;'.$count.
-                 '</span><br />';
+                 '</nobr><br />';
     } else {
-        $entry = '<span class="LC_nobreak">'.$text.'&nbsp;-&nbsp;'.$count.'</span><br />';
+        $entry = '<nobr>'.$text.'&nbsp;-&nbsp;'.$count.'</nobr><br />';
     }
     return $entry;
 }
@@ -1674,8 +1668,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>
@@ -2071,13 +2065,13 @@ sub pick_new_members {
         if (@{$available} > 0 && $granularity eq 'Yes') {
             $r->print('<td>
      <fieldset><legend><b>'.$lt{'setf'}.'</b></legend>
-      <span class="LC_nobreak">
+      <nobr>
       <input type="button" value="'.&mt('check all').'"
         onclick="javascript:checkAllTools(document.'.$formname.')" />
         &nbsp;&nbsp;
       <input type="button" value="'.&mt('uncheck all').'"
         onclick="javascript:uncheckAllTools(document.'.$formname.')" />
-      </span>
+      </nobr>
      </fieldset></td>');
         }
         $r->print('</tr></table>
@@ -2100,13 +2094,13 @@ sub pick_new_members {
             if ($granularity eq 'Yes') {
                 $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense LC_data_table_highlight').'
  <td colspan="6">&nbsp;</td>
- <td align="center"><span class="LC_nobreak"><b>'.&mt('All:').'</b>&nbsp;');
+ <td align="center"><nobr><b>'.&mt('All:').'</b>&nbsp;');
                 foreach my $tool (@{$available}) {
                     $r->print('<label><input type="checkbox" name="togglefunc" '.
    'onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);"'.
    ' value="'.$tool.'">'.'<b>'.$tool.'</b></label>&nbsp;&nbsp;&nbsp;');
                 }
-                $r->print('</span></td></tr>');
+                $r->print('</nobr></td></tr>');
             }
         }
         my %Sortby = ();
@@ -2140,7 +2134,7 @@ sub pick_new_members {
 			  '<td>'.$id.'</td>'.
 			  '<td>'.$section.'</td>');
                 if (@{$available} > 0) {
-                    $r->print('<td align="center"><span class="LC_nobreak">'.
+                    $r->print('<td align="center"><nobr>'.
                               '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');
                     foreach my $tool (@{$available}) {
                         if ($granularity eq 'Yes') {
@@ -2151,7 +2145,7 @@ sub pick_new_members {
                           $tool.'" value="'.$user.'" />'.$tool.'&nbsp;&nbsp;&nbsp;');
                         }
                     }
-                    $r->print('</span></td>');
+                    $r->print('</nobr></td>');
                 }
                 $r->print(&Apache::loncommon::end_data_table_row()."\n");
             }
@@ -2238,8 +2232,8 @@ sub privilege_specificity {
         if ($totaloptionalprivs) {
             $r->print('
 <br />
-<label><span class="LC_nobreak"><input type="radio" name="specificity" value="No" '.$specific{'No'}.' />&nbsp;'.$lt{'algm'}.'</span></label><br />
-<label><span class="LC_nobreak"><input type="radio" name="specificity" value="Yes" '.$specific{'Yes'}.' />&nbsp;'.$lt{'smgp'}.'</span></label><br /><br />');
+<label><nobr><input type="radio" name="specificity" value="No" '.$specific{'No'}.' />&nbsp;'.$lt{'algm'}.'</nobr></label><br />
+<label><nobr><input type="radio" name="specificity" value="Yes" '.$specific{'Yes'}.' />&nbsp;'.$lt{'smgp'}.'</nobr></label><br /><br />');
         } else {
             $r->print('<input type="hidden" name="specificity" value="No" />');
         }
@@ -2515,7 +2509,7 @@ sub current_membership {
                 $r->print(&check_uncheck_tools($r,$available));
                 $r->print('
      <td>
-      <span class="LC_nobreak">
+      <nobr>
        <fieldset><legend><b>'.$lt{'curf'}.'</b></legend>
        <input type="button" value="'.&mt('check all').'"
        onclick="javascript:checkAllTools(document.'.$formname.')" />
@@ -2523,7 +2517,7 @@ sub current_membership {
        <input type="button" value="'.&mt('uncheck all').'"
         onclick="javascript:uncheckAllTools(document.'.$formname.')" />
       </fieldset>
-     </span>
+     </nobr>
     </td>
 ');
             }
@@ -2558,14 +2552,14 @@ END
             if ($granularity eq 'Yes') {
                 $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense LC_data_table_highlight').'
  <td colspan="7">&nbsp;</td>
- <td colspan="'.$colspan.'" align="center"><span class="LC_nobreak"><b>'.&mt('All:').
+ <td colspan="'.$colspan.'" align="center"><nobr><b>'.&mt('All:').
   '</b>&nbsp;');
                 foreach my $tool (@{$available}) {
                     $r->print('<label><input type="checkbox" name="togglefunc"'.
    ' onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);"'.
    ' value="'.$tool.'" />'.'<b>'.$tool.'</b></label>&nbsp;&nbsp;&nbsp;');
                 }
-                $r->print('</span></td></tr>');
+                $r->print('</nobr></td></tr>');
             }
         }
         my %Sortby = ();
@@ -2593,25 +2587,25 @@ END
                 $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense').'
                             <td>');
                 if ($$current{$user}{changestate} eq 'reenable') {
-                    $r->print('<span class="LC_nobreak"><label>'. 
+                    $r->print('<nobr><label>'. 
    '<input type="checkbox" name="reenable" value="'.$user.'" />'.
-   $lt{'reen'}.'</label></span><br />');
+   $lt{'reen'}.'</label></nobr><br />');
                 } elsif ($$current{$user}{changestate} eq 'expire') {
-                    $r->print('<span class="LC_nobreak"><label>'.
+                    $r->print('<nobr><label>'.
    '<input type="checkbox" name="expire" value="'.$user.'" />'.
-   $lt{'expi'}.'</label></span><br />');
+   $lt{'expi'}.'</label></nobr><br />');
                 } elsif ($$current{$user}{changestate} eq 'activate') {
-                    $r->print('<span class="LC_nobreak"><label>'.
+                    $r->print('<nobr><label>'.
    '<input type="checkbox" name="activate" value="'.$user.'" />'.
-   $lt{'acti'}.'</label></span><br />');
+   $lt{'acti'}.'</label></nobr><br />');
                 }
-                $r->print('<span class="LC_nobreak"><label>'.
+                $r->print('<nobr><label>'.
    '<input type="checkbox" name="deletion" value="'.$user.'" />'.
-   $lt{'dele'}.'</label></span>');
+   $lt{'dele'}.'</label></nobr>');
                 if ($specificity eq 'Yes') {
-                    $r->print('<br /><span class="LC_nobreak"><label>'.
+                    $r->print('<br /><nobr><label>'.
    '<input type="checkbox" name="changepriv" value="'.$user.'" />'.$lt{'chpr'}.
-   '</label></span>');
+   '</label></nobr>');
                 }
                 $r->print('
    </td>'.
@@ -2622,7 +2616,7 @@ END
    '<td>'.$start.'</td>'.
    '<td>'.$end.'</td>');
                 if ($hastools) {
-                    $r->print('<td align="left"><span class="LC_nobreak">'.
+                    $r->print('<td align="left"><nobr>'.
                                   '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');
                     foreach my $tool (@{$$current{$user}{currtools}}) {
                         if ($granularity eq 'Yes') {
@@ -2638,23 +2632,23 @@ END
                          }
                          $r->print('&nbsp;&nbsp;&nbsp;');
                     }
-                    $r->print('</span></td>');
+                    $r->print('</nobr></td>');
                 }
                 if ($addtools) {
                     $r->print('<td align="left">');
                     if ($granularity eq 'Yes') {
                         foreach my $tool (@{$$current{$user}{newtools}}) {
-                            $r->print('<span class="LC_nobreak"><label><input type="checkbox"
+                            $r->print('<nobr><label><input type="checkbox"
                                           name="user_'.$tool.'" value="'.
                                           $user.'" />'.$tool.
-                                          '</label></span>&nbsp;&nbsp;&nbsp;');
+                                          '</label></nobr>&nbsp;&nbsp;&nbsp;');
                         }
                     } else {
                         foreach my $tool (@{$$current{$user}{newtools}}) {
-                            $r->print('<span class="LC_nobreak"><input type="hidden" 
+                            $r->print('<nobr><input type="hidden" 
                                           name="user_'. $tool.'" value="'.
                                           $user.'" />'.$tool.
-                                          '</span>&nbsp;&nbsp;&nbsp;');
+                                          '</nobr>&nbsp;&nbsp;&nbsp;');
                         }
                     }
                     $r->print('</td>');
@@ -2675,13 +2669,13 @@ sub check_uncheck_buttons {
      <td '.$colspan.'>
        <fieldset>
        <legend><b>'.$title.'</b></legend>
-      <span class="LC_nobreak">
+      <nobr>
        <input type="button" value="'.&mt('check all').'"
        onclick="javascript:checkAll(document.'.$formname.'.'.$field.')" />
        &nbsp;&nbsp;
        <input type="button" value="'.&mt('uncheck all').'"
        onclick="javascript:uncheckAll(document.'.$formname.'.'.$field.')" />
-      </span>
+      </nobr>
        </fieldset>
      </td>
 ');
@@ -3228,49 +3222,36 @@ sub write_group_data {
                 my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/';
                 my $boardsmap = $crspath.'group_boards_'.$groupname.'.sequence';
                 my $navmap = Apache::lonnavmaps::navmap->new();
-                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' );
-                            }
+                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>');
                         } else {
-                            $r->print($outcome);
+                            $r->print('<div class="LC_success">'
+                                     .&mt('Discussion Boards Folder created.')
+                                     .'</div>');
                         }
+                    } else {
+                        $r->print($outcome);
                     }
-                } 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>');
+                    undef($navmap);
                 }
             }
             $r->print('<div class="LC_success">'
@@ -3528,7 +3509,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?",
@@ -3553,19 +3533,19 @@ sub automapping {
     }
     $r->print(&Apache::lonhtmlcommon::topic_bar($image,$$lt{'endi'}).'
     <b>'.$$lt{'gmma'}.':</b><br />'.$$lt{'adds'}.'<br />'.$$lt{'drops'}.'<br /><br />
-   <span class="LC_nobreak">'.$$lt{'auad'}.':&nbsp;
+   <nobr>'.$$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;
+    </nobr><br />
+    <nobr>'.$$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'});
+    $r->print('</nobr><br /><br />'.$$lt{'mapr'});
 }
 
 sub mapping_settings {
@@ -3725,16 +3705,16 @@ sub member_privs_entries {
                         if ($privcount == 3) {
                             $dynamic .= '</tr><tr>';
                         }
-                        $dynamic .='<td><span class="LC_nobreak"><label><input type="checkbox" '.
+                        $dynamic .='<td><nobr><label><input type="checkbox" '.
                                'name="userpriv_'.$priv.'" value="'.$user.'"';
                         if (grep/^\Q$priv\E$/,@{$defprivs}) {
                             $dynamic .= ' checked="checked" ';
                         }
                         $dynamic .= ' />'.$$toolprivs{$tool}{$priv}.
-                                    '</label></span></td>';
+                                    '</label></nobr></td>';
                     }
                 }
-                $r->print('<tr><td colspan="2"><span class="LC_nobreak">'.$fixed.'</span></td></tr><tr>'.$dynamic.'</tr></table></td>');
+                $r->print('<tr><td colspan="2"><nobr>'.$fixed.'</nobr></td></tr><tr>'.$dynamic.'</tr></table></td>');
             } else {
                 $r->print('<td valign="top"><table width="100%"><tr><th colspan="2">'.$tool.'</th></tr><tr><td>&nbsp;</td></tr><tr><td>&nbsp;</td></tr></table></td>');
             }
@@ -3761,8 +3741,8 @@ sub date_setting_table {
     my $endform = &Apache::lonhtmlcommon::date_setter($formname,
                                                       'enddate',$endtime);
     my $perpetual = 
-	'<span class="LC_nobreak"><label><input type="checkbox" name="no_end_date" />'.
-	&mt('None').'</label></span>';
+	'<nobr><label><input type="checkbox" name="no_end_date" />'.
+	&mt('None').'</label></nobr>';
     my $table = "<table class=\"LC_descriptive_input\">\n".
 	'<tr><td class="LC_description">'.&mt('Start:').'</td>'.
         '<td>'.$startform.'</td>'.
@@ -3806,7 +3786,7 @@ sub add_group_folder {
                     if ($delresult ne 'ok') {
                         $warning = $delresult;
                     }
-                    return $outcome.$warning;
+                    return $outcome;
                 }
             }
             my $delresult = &release_folder_lock($cdom,$cnum,'group_allfolders');
@@ -3816,7 +3796,7 @@ sub add_group_folder {
         } else {
             $outcome = '<span class="LC_error">'
                       .&mt('Could not obtain exclusive lock to check status of the folder for all groups. No group folder added.')
-                      .'</span>';
+                      .'</div>';
             return $outcome;
         }
         my $grpfolder = &mt($ucgpterm.' Folder - [_1]',$description);
@@ -3847,10 +3827,6 @@ 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') {
@@ -3956,13 +3932,6 @@ 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,