[LON-CAPA-cvs] cvs: loncom /interface loncoursegroups.pm longroup.pm

[schafran]

schafran		Thu Feb  5 12:32:26 2009 EDT

  Modified files:              
    /loncom/interface	longroup.pm loncoursegroups.pm 
  Log:
  Collaborative Tool, keys were displayed in the table header, now are values displayed.
  
  
  
Index: loncom/interface/longroup.pm
diff -u loncom/interface/longroup.pm:1.19 loncom/interface/longroup.pm:1.20
--- loncom/interface/longroup.pm:1.19	Fri Jan 30 16:13:04 2009
+++ loncom/interface/longroup.pm	Thu Feb  5 12:32:26 2009
@@ -438,7 +438,7 @@
 
 sub get_fixed_privs {
     my $fixedprivs = {
-                      communication          => {sgm => 1},
+                      email          => {sgm => 1},
                       discussion     => {vgb => 1},
                       chat           => {pgc => 1},
                       files          => {rgf => 1},
@@ -453,7 +453,7 @@
 sub get_tool_privs {
     my ($gpterm) = @_;
     my $toolprivs = {
-        communication    => {
+        email    => {
             sgm => 'Send '.$gpterm.' message',
             sgb => 'Broadcast message',
         },
Index: loncom/interface/loncoursegroups.pm
diff -u loncom/interface/loncoursegroups.pm:1.91 loncom/interface/loncoursegroups.pm:1.92
--- loncom/interface/loncoursegroups.pm:1.91	Mon Feb  2 13:27:39 2009
+++ loncom/interface/loncoursegroups.pm	Thu Feb  5 12:32:26 2009
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.91 2009/02/02 13:27:39 schafran Exp $
+# $Id: loncoursegroups.pm,v 1.92 2009/02/05 12:32:26 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,7 +75,7 @@
     my $crstype = &Apache::loncommon::course_type();
 
     my %functions = (
-                      communication => 'Send Messages', 
+                      email => 'Send Messages', 
                       discussion => 'Discussion Boards',
                       chat => 'Chat',
                       files => 'File Repository',
@@ -1588,7 +1588,7 @@
         @{$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);
@@ -2169,7 +2169,7 @@
 
 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 @@
             $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 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',
@@ -2300,11 +2300,11 @@
     $r->print(&Apache::lonhtmlcommon::start_pick_box('LC_group_priv_box').
 	      &Apache::lonhtmlcommon::row_title($lt{'func'},undef,
      						'LC_groups_functionality'));
-    my @printtool = @{$tools};
-    foreach my $printtool (@printtool){
-	$printtool = &mt($printtool);
-    }
-    $r->print(join('</td><td class="LC_groups_functionality">', @printtool));
+    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 = '';