--- loncom/interface/loncoursegroups.pm	2008/12/16 16:44:28	1.84
+++ loncom/interface/loncoursegroups.pm	2009/05/07 16:09:55	1.98
@@ -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.98 2009/05/07 16:09:55 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,10 +75,10 @@ sub handler {
     my $crstype = &Apache::loncommon::course_type();
 
     my %functions = (
-                      email => 'E-mail',
+                      email => 'Send Messages', 
                       discussion => 'Discussion Boards',
-                      chat => 'Chat',
-                      files => 'File Repository',
+                      chat => 'Chat Room',
+                      files => 'Group Portfolio',
                       roster => 'Membership Roster',
                       homepage => $ucgpterm.' home page',
                     );
@@ -141,7 +141,7 @@ function openGroupRoster(group,status) {
     rosterbrowser = open(url,title,options,'1');
     rosterbrowser.focus();
 }\n|;
-    $r->print(&header('Groups',$jscript,$action,$state));
+    $r->print(&header('My Space',$jscript,$action,$state));
     if ($env{'form.refpage'} eq 'cusr') {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"/adm/createuser",
@@ -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>'.
@@ -785,7 +785,7 @@ sub group_administration {
     }
     var maxposs = '.sprintf("%.2f",$maxposs).';
     if (newquota > maxposs) {
-        alert("The file repository 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 +804,7 @@ sub group_administration {
             }
         }
         if (warn_zero == 1) {
-            alert("You have indicated that the file repository 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 respository quota to 0 Mb.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature.");
             return;
         }
     } 
@@ -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 => 'Back',#'Go to previous step',
                              crgr => 'Create '.$gpterm,
-                             mose => 'Modify settings',
-                             gtpp => 'Go to previous page',
+                             mose => 'Save',#'Modify settings',
+                             gtpp => 'Back',#'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());
     }
@@ -1582,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);
@@ -1606,33 +1612,34 @@ sub groupsettings_options {
         'lett' => 'Letters, numbers and underscore only',
         'doyo' => 'Different subsets of the chosen collaborative tools '.
                   'for different group members?',
+        'gran' => 'Granularity',
+        'dquo' => 'Disk quota',
     );
     my ($crsquota,$freespace,$maxposs) = &get_quota_constraints($action,$stored);
-    $r->print(&Apache::lonhtmlcommon::topic_bar($image,$lt{'gnde'}).'
-     <table class="LC_descriptive_input">
-      <tr>
-       <td class="LC_description">'.$lt{'gnam'}.':</td>
-       <td colspan="5">
-');
+    $r->print(&Apache::lonhtmlcommon::topic_bar($image,$lt{'gnde'}));
+
+    # Group Name
+    $r->print(&Apache::lonhtmlcommon::start_pick_box()
+             .&Apache::lonhtmlcommon::row_title($lt{'gnam'})
+    );
     if ($action eq 'create') {
-        $r->print('<input type="text" name="groupname" size="25" />&nbsp;('.
-                  $lt{'lett'}.')');
+        $r->print('<input type="text" name="groupname" size="25" />'
+                 .' <span class="LC_nobreak">('
+                 .$lt{'lett'}.')</span>'
+        );
     } else {
         $r->print('<input type="hidden" name="groupname" value="'.
                          $env{'form.groupname'}.'" />'.$env{'form.groupname'});
     }
-    $r->print(<<"END");
-       </td>
-      <tr>
-      <tr>
-       <td class="LC_description">$lt{'desc'}:</td>
-       <td colspan="5"><input type="text" name="description" size="40"
-                                                    value="" />
-       </td>
-      <tr>
-      <tr>
-       <td class="LC_description">$lt{'func'}:</td>
-END
+    $r->print(&Apache::lonhtmlcommon::row_closure());
+
+    # Group Title
+    $r->print(&Apache::lonhtmlcommon::row_title($lt{'desc'})
+             .'<input type="text" name="description" size="40" value="" />'
+             .&Apache::lonhtmlcommon::row_closure()
+    );
+
+    # Collaborative Tools
     my $numitems = keys(%{$functions});
     my $halfnum = int($numitems/2);
     my $remnum = $numitems%2;
@@ -1640,48 +1647,61 @@ END
         $halfnum ++;
     }
     my @allfunctions = sort(keys (%{$functions}));
-    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>
-                   <td>&nbsp;</td><td>&nbsp;</td>');
-    }
-    $r->print('<td><input type="button" value="'.&mt('check all').'" '.
-              'onclick="javascript:checkAll(document.'.$formname.'.tool)" />'.
-              '</td></tr><tr><td>&nbsp;</td>');
-    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>
-                  <td>&nbsp;</td><td>&nbsp;</td>');
-    }
-    if ($remnum) {
-        $r->print('<td>&nbsp;</td>');
+
+    $r->print(&Apache::lonhtmlcommon::row_title($lt{'func'})
+             .'<div>'
+             .'<input type="button" value="'.&mt('check all').'"'
+             .' onclick="javascript:checkAll(document.'.$formname.'.tool)" />'
+             .'&nbsp;<input type="button" value="'.&mt('uncheck all').'"'
+             .' onclick="javascript:uncheckAll(document.'.$formname.'.tool)" />'
+             .'</div>'
+             .'<table cellpadding="5px"><tr>' # FIXME Get rid of inflexible table (-> float)
+    );
+    for (my $i=0; $i<@allfunctions; $i++) {
+        $r->print('<td><label><span class="LC_nobreak">'
+                 .'<input type="checkbox" name="tool" value="'
+                 .$allfunctions[$i].'" /> '
+                 .&mt($$functions{$allfunctions[$i]})
+                 .'</span></label></td>'
+        );
+        if ($i == $halfnum - 1) {
+            $r->print('</tr><tr>');
+        }
     }
-    $r->print('
-       <td>
-        <input type="button" value="'.&mt('uncheck all').'"
-          onclick="javascript:uncheckAll(document.'.$formname.'.tool)" />
-       </td>
-      </tr>
-      <tr>
-       <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>');
+    $r->print('</tr></table>'
+             .&Apache::lonhtmlcommon::row_closure()
+    );
+
+    # Granularity
+    $r->print(&Apache::lonhtmlcommon::row_title($lt{'gran'})
+             .$lt{'doyo'}.'<br />'
+             .'<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(' <span class="LC_nobreak">('
+                 .&mt('Currently set to [_1].'
+                     ,'"'.&mt($$stored{'granularity'}).'"')
+                 .')</span>'
+        );
     }
-    $r->print('
-       </td>
-      </tr>
-      <tr>
-       <td class="LC_description">'.&mt('Disk quota: ').'</td><td colspan="10">');
+    $r->print(&Apache::lonhtmlcommon::row_closure());
+
+    # Disk Quota
+    $r->print(&Apache::lonhtmlcommon::row_title($lt{'dquo'}));
     if ($action eq 'create') {
-        $r->print(&mt('If you enable the file repository for the '.$gpterm.', allocate a disk quota.'));
+        $r->print('<span class="LC_info">'
+                 .&mt('If you enable the group portfolio for the '.$gpterm
+                     .', allocate a disk quota.')
+                 .'</span>'
+        );
     } else {
-        $r->print(&mt('Quota allocated to file repository:'));
+        $r->print(&mt('Quota allocated to group portfolio:'));
     } 
-    $r->print('&nbsp;'.&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 '
@@ -1697,11 +1717,10 @@ END
                  .'by adding all unallocated space for '.$gpterm.'s in the '.lc($crstype).'.'
                   ,sprintf("%.2f",$maxposs)));
     }
-    $r->print('
-       </td>
-      </tr>
-     </table>
-');
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+
     return;
 }
 
@@ -1798,7 +1817,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;
@@ -2163,7 +2182,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, '.
@@ -2260,7 +2279,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'});
@@ -2284,7 +2303,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',
@@ -2293,8 +2312,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 = '';
@@ -2310,7 +2333,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 +2348,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) {
@@ -3122,7 +3145,7 @@ sub write_group_data {
     if ($quota !~ /^\d*\.?\d*$/) {
         $quota = 0;
         $r->print('<div class="LC_warning">'
-                 .&mt('The value you entered for the quota for the file repository in this '.$gpterm
+                 .&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'
                  .' modifying the '.$gpterm.' settings.')
                  .'</div>');
@@ -3130,7 +3153,7 @@ sub write_group_data {
     if ($quota > $maxposs) {
         $quota = $maxposs;
         $r->print('<div class="LC_warning">'
-                 .&mt('The value you entered for the quota for the file repository in this '.$gpterm
+                 .&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 '
                  .'(the maximum possible value).',sprintf("%.2f",$maxposs))
                  .'</div>');
@@ -3222,36 +3245,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">'
@@ -3740,17 +3776,19 @@ sub date_setting_table {
                                                       'startdate',$starttime);
     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>';
-    my $table = "<table class=\"LC_descriptive_input\">\n".
-	'<tr><td class="LC_description">'.&mt('Start:').'</td>'.
-        '<td>'.$startform.'</td>'.
-        '<td>&nbsp;</td>'."</tr>\n".
-	'<tr><td class="LC_description">'.&mt('End:').'</td>'.
-        '<td>'.$endform.'</td>'.
-        '<td>'.$perpetual.'</td>'."</tr>\n".
-	"</table>\n";
+    my $perpetual = ' <span class="LC_nobreak"><label>'
+                   .'<input type="checkbox" name="no_end_date" />'
+                   .&mt('No end date')
+                   .'</label></span>';
+    my $table = &Apache::lonhtmlcommon::start_pick_box()
+               .&Apache::lonhtmlcommon::row_title(&mt('Start Date'))
+               .$startform
+               .&Apache::lonhtmlcommon::row_closure()
+               .&Apache::lonhtmlcommon::row_title(&mt('End Date'))
+               .$endform
+               .$perpetual
+               .&Apache::lonhtmlcommon::row_closure(1)
+               .&Apache::lonhtmlcommon::end_pick_box();
     return $table;
 }
 
@@ -3827,6 +3865,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 +3974,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,