--- loncom/interface/loncoursegroups.pm	2008/12/16 23:52:08	1.80.2.3
+++ loncom/interface/loncoursegroups.pm	2009/02/05 12:32:26	1.92
@@ -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.92 2009/02/05 12:32:26 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,11 +75,11 @@ sub handler {
     my $crstype = &Apache::loncommon::course_type();
 
     my %functions = (
-                      email => 'E-mail',
-                      discussion => 'Discussion boards',
+                      email => 'Send Messages', 
+                      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">'.
-                                  '<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')) &&
@@ -1588,7 +1588,7 @@ sub general_settings_form {
         @{$tools} = sort(keys(%{$functions}));
         &privilege_specificity($r,$action,3,$tools,$stored,$toolprivs,
 			       $fixedprivs,\@available,$formname,
-			       $gpterm,$ucgpterm);
+			       $gpterm,$ucgpterm,$functions);
         &mapping_options($r,$action,$formname,$page,$sectioncount,
                          $states,$stored,$navbuttons,4,5,
 			 $gpterm,$ucgpterm,$crstype,$cdom,$cnum);
@@ -1649,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').'" '.
@@ -1658,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) {
@@ -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>
@@ -1804,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;
@@ -2169,7 +2169,7 @@ sub pick_new_members {
 
 sub privilege_specificity {
     my ($r,$action,$img,$tools,$stored,$toolprivs,$fixedprivs,$available,
-	$formname,$gpterm,$ucgpterm) = @_;
+	$formname,$gpterm,$ucgpterm,$functions) = @_;
     my %lt = &Apache::lonlocal::texthash (
       'uprv' => 'User privileges for collaborative tools',
       'frty' => 'For each collaborative tool you have chosen to include, '.
@@ -2266,7 +2266,7 @@ sub privilege_specificity {
             $r->print($lt{'algm'}.'<br /><br />');
         }
         &default_privileges($r,$action,$tools,$toolprivs,$fixedprivs,
-			    $available);
+			    $available,$functions);
     } else {
         if ($action eq 'create') {
             $r->print($lt{'asyo'});
@@ -2290,7 +2290,7 @@ sub privilege_specificity {
 }
 
 sub default_privileges {
-    my ($r,$action,$tools,$toolprivs,$fixedprivs,$available) = @_;
+    my ($r,$action,$tools,$toolprivs,$fixedprivs,$available,$functions) = @_;
     my %lt = &Apache::lonlocal::texthash(
                                 'addp' => 'Additional privileges',
                                 'fixp' => 'Fixed privileges',
@@ -2299,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 @tableHeader;
+    foreach my $key (sort(keys(%{$functions}))){
+        push (@tableHeader,&mt(${$functions}{$key}));
+    }   
+ $r->print(join('</td><td class="LC_groups_functionality">', @tableHeader));
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
     my $fixed = '';
     my $dynamic = '';
@@ -2316,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;';
@@ -2331,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) {
@@ -3238,7 +3242,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 +3532,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 +3559,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'});
 }