--- loncom/interface/loncoursegroups.pm	2013/07/15 16:13:21	1.117
+++ loncom/interface/loncoursegroups.pm	2014/06/18 16:34:39	1.126
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.117 2013/07/15 16:13:21 bisitz Exp $
+# $Id: loncoursegroups.pm,v 1.126 2014/06/18 16:34:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ use strict;
 use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
+use Apache::lonhtmlgateway;
 use Apache::lonlocal;
 use Apache::lonnavmaps();
 use Apache::longroup();
@@ -188,7 +189,7 @@ sub display_groups {
                           crtd   => 'Created',
                           last   => 'Last Modified',
                           func   => 'Collaborative Tools',
-                          quot   => 'Quota (Mb)',
+                          quot   => 'Quota (MB)',
                           memb   => 'Members',
                           file   => 'Files',
                           dibd   => 'Discussion Boards',
@@ -811,7 +812,7 @@ sub group_administration {
     }
     var maxposs = '.sprintf("%.2f",$maxposs).';
     if (newquota > maxposs) {
-        alert("The group portfolio 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.';
@@ -830,7 +831,7 @@ sub group_administration {
             }
         }
         if (warn_zero == 1) {
-            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.");
+            alert("You have indicated that the group portfolio should be enabled, but you have set the repository quota to 0 MB.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature.");
             return;
         }
     } 
@@ -1756,19 +1757,19 @@ sub groupsettings_options {
     } else {
         $r->print(&mt('Quota allocated to group portfolio:'));
     } 
-    $r->print(' '.&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 '
-                     .lc($crstype).', and [_2] Mb are currently unallocated.'
+                 .&mt('A total of [_1] MB can be divided amongst all '.$gpterm.'s in the '
+                     .lc($crstype).', and [_2] MB are currently unallocated.'
                      ,$crsquota,sprintf("%.2f",$freespace))
                  );
     } else {
-        $r->print('&nbsp;&nbsp;('.&mt('The quota is currently [_1] Mb',
+        $r->print('&nbsp;&nbsp;('.&mt('The quota is currently [_1] MB',
                                       $$stored{'quota'}).').');
 
         $r->print('<br />'
-                 .&mt('The quota can be increased to [_1] Mb, '
+                 .&mt('The quota can be increased to [_1] MB, '
                  .'by adding all unallocated space for '.$gpterm.'s in the '.lc($crstype).'.'
                   ,sprintf("%.2f",$maxposs)));
     }
@@ -2016,10 +2017,10 @@ sub print_current_settings {
         dfac => 'Default access dates',
         ygrs => "Your group selections - ",
         tfwa => "The following settings will apply to the group:",
-        difn => 'Different collaborative tools<br />for different members:',
         stda => 'Start date:',
         enda => 'End date:',
     );
+    $lt{'difn'} = &mt('Different collaborative tools[_1]for different members:','<br />');
     my $showstart = &Apache::lonlocal::locallocaltime($startdate);
     my $showend;
     if ($enddate == 0) {
@@ -2069,7 +2070,7 @@ sub print_current_settings {
         $r->print('</ul>');
     }
 
-    my $quota_text=&mt('[_1] Mb',$quota);
+    my $quota_text=&mt('[_1] MB',$quota);
     my $granu_text=&mt($granularity);
     $r->print(<<"END");
   </td>
@@ -2548,6 +2549,7 @@ sub current_membership {
                                           'actn' => 'Action?',
                                           'name' => 'Name',
                                           'usnm' => 'Username',
+                                          'stid' => 'ID',
                                           'doma' => 'Domain',
                                           'stda' => 'Start Date',
                                           'enda' => 'End Date',
@@ -2609,7 +2611,7 @@ END
      <th><a href="javascript:changeSort('fullname')">$lt{'name'}</a></th>
      <th><a href="javascript:changeSort('username')">$lt{'usnm'}</a></th>
      <th><a href="javascript:changeSort('domain')">$lt{'doma'}</a></th>
-     <th><a href="javascript:changeSort('id')">ID</a></th>
+     <th><a href="javascript:changeSort('id')">$lt{'ID'}</a></th>
      <th><a href="javascript:changeSort('start')">$lt{'stda'}</a></th>
      <th><a href="javascript:changeSort('end')">$lt{'enda'}</a></th>
 END
@@ -2733,7 +2735,10 @@ END
         }
         $r->print(&Apache::loncommon::end_data_table());
     } else {
-        $r->print(&mt('There are no active, future or previous group members to modify.'));
+        $r->print(
+            '<p class="LC_info">'
+           .&mt('There are no active, future or previous group members to modify.')
+           .'</p>');
     }
     return $numcurrent;
 }
@@ -2801,7 +2806,7 @@ sub change_privs_form {
         }
     }
     if (!$exp_or_del) {
-        $r->print($lt{'nome'}.'<br />');
+        $r->print('<p class="LC_info">'.$lt{'nome'}.'</p>');
     }
     
     $r->print(&Apache::lonhtmlcommon::topic_bar(4,&mt('Setting optional privileges for specific group members')));
@@ -3197,7 +3202,7 @@ sub write_group_data {
         $quota = 0;
         $r->print('<div class="LC_warning">'
                  .&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'
+                 .' contained invalid characters, so it has been set to 0 MB. You can change this by'
                  .' modifying the '.$gpterm.' settings.')
                  .'</div>');
     }
@@ -3205,7 +3210,7 @@ sub write_group_data {
         $quota = $maxposs;
         $r->print('<div class="LC_warning">'
                  .&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 '
+                 .' exceeded the maximum possible value, so it has been set to [_1] MB '
                  .'(the maximum possible value).',sprintf("%.2f",$maxposs))
                  .'</div>');
     }
@@ -3364,10 +3369,10 @@ sub write_group_data {
         &Apache::lonnet::logthis("Failed to store $gpterm $groupname ".
                                  'in '.lc($crstype).': '.$cnum.
                                  ' in domain: '.$cdom);
-        $r->print('<div class="LC_error">'
-                 .&mt('An error occurred when [_1] the '.$gpterm.'. '
-                 .'Please try again.',$actiontype{$action})
-                 .'</div>');
+        $r->print('<p class="LC_error">'
+                 .&mt('An error occurred when '.$actiontype{$action}.' the '.$gpterm.'. '
+                 .'Please try again.')
+                 .'</p');
     }
     return $result;
 }
@@ -3498,7 +3503,7 @@ sub process_membership {
                 if (grep/^$user$/,@reenable) {
                     $start = $startdate;
                     $end = $enddate;
-                    $type = 'reenabled';
+                    $type = 're-enabled';
                 }
             }
             if ($type eq '') {
@@ -3534,11 +3539,12 @@ sub process_membership {
     if ($num_ok) {
         my $msgall ='';
         foreach my $type (sort(keys(%added))) {
-            my $message = &mt('The following users were successfully [_1]',$type); 
+            my $message;
+            my $tmsg = "The following users were successfully $type"; 
             if (!($type eq 'deleted' || $type eq 'expired')) {   
-                $message .= &mt(' with the following privileges');
+                $tmsg .= ' with the following privileges';
             }
-            $message .= ':<br/>';
+            $message .= &mt($tmsg.':').'<br/>';
             foreach my $user (@{$added{$type}}) {
                 my $privlist = '';
                 if (!($type eq 'deleted' ||  $type eq 'expired')) {
@@ -4120,10 +4126,9 @@ sub create_homepage {
     my ($cdom,$cnum,$name,$groupinfo,$tools,$gpterm,$ucgpterm,$now) = @_;
     my $functionality = join(',',@{$tools});
     my $content = &unescape($$groupinfo{description});
-    $content=~s/\s+$//s;
-    $content=~s/^\s+//s;
-    $content=~s/\<br\s*\/*\>$//s;
-    $content=&Apache::lonfeedback::clear_out_html($content,1);
+    chomp($content);
+    my $gateway = Apache::lonhtmlgateway->new();
+    $content = $gateway->process_incoming_html($content,1);
 
     my %pageinfo = (
                      'aaa_title' => "$ucgpterm: $name",
@@ -4183,43 +4188,40 @@ sub validate_groupname {
     }
     my %lt = &Apache::lonlocal::texthash (
                       igna => "Invalid $gpterm name",
-                      tgne => "The $gpterm name entered ",
                       grna => "$ucgpterm names and section names used in a ".
                                "$crstype must be unique.",
-                      isno => "is not a valid name.",
                       gnmo => "$ucgpterm names may only contain letters, ". 
                               "numbers or underscores.",
-                      cnnb => "can not be used as it is the name of ",
-                      inth => " in this $crstype", 
-                      thgr => "- does not correspond to the name of an ".
-                              "existing $gpterm",    
     );
 
-    my $exitmsg = '<span class="LC_error">'.$lt{'igna'}.'</span><br /><br />'.
-	$lt{'tgne'}.' "'.$groupname.'" ';
-    my $dupmsg = $lt{'grna'};
-    my $earlyout;
+    my $exitmsg = '<span class="LC_error">'.$lt{'igna'}.'</span><br /><br />';
+    my $nameshown = &Apache::loncommon::cleanup_html($groupname);
     if (($groupname eq '') || ($groupname =~ /\W/)) {
-        $earlyout = $exitmsg.$lt{'isno'}.'<br />'.$lt{'gnmo'};
-        return $earlyout;
+        return $exitmsg.
+               &mt("The $gpterm name entered '[_1]' is not a valid name.",$nameshown).
+               '<br />'.$lt{'gnmo'};
+    } elsif ($groupname eq 'syllabus') {
+        return $exitmsg.
+               &mt("The $gpterm name entered '[_1]' is reserved for use by LON-CAPA.",$nameshown);
     }
     if (exists($sectioncount{$groupname})) {
-	return $exitmsg.$lt{'cnnb'}.&mt('a section').$lt{'inth'}.
-	    '<br />'.$lt{'grna'};
+	return  $exitmsg.
+                &mt("The $gpterm name entered '[_1]' can not be used as it is the name of a section in this $crstype.",$nameshown).
+	        '<br />'.$lt{'grna'};
     }
     if ($action eq 'create') { 
 	if (exists($curr_groups{$groupname})) {
-	    return $exitmsg.$lt{'cnnb'}.&mt('an existing [_1]',$gpterm).
-	           $lt{'inth'}.'.<br />'.$lt{'grna'};
+	    return $exitmsg.
+                   &mt("The $gpterm name entered '[_1]' can not be used as it is the name of an existing $gpterm in this $crstype.",$nameshown).
+                  '<br />'.$lt{'grna'};
         } elsif (exists($deleted_groups{$groupname})) {
-            return $exitmsg.$lt{'cnnb'}.&mt('a [_1] which previously existed',$gpterm).
-                   $lt{'inth'}.'.<br />'.$lt{'grna'};
+            return $exitmsg.
+                   &mt("The $gpterm name entered '[_1]' can not be used as it is the name of a $gpterm which previously existed in this $crstype.",$nameshown).
+                   '<br />'.$lt{'grna'};
         }
     } elsif ($action eq 'modify') {
         unless(exists($curr_groups{$groupname})) {
-            $earlyout = &mt('[_1] name:',$ucgpterm).' '.$groupname.$lt{'thgr'}.
-                        $lt{'inth'};
-            return $earlyout;
+            return &mt("$ucgpterm name: [_1] does not correspond to the name of an existing $gpterm in this $crstype.",$nameshown);
         }
     }
     return;