Diff for /loncom/interface/lonviewclasslist.pm between versions 1.16 and 1.17

version 1.16, 2014/10/26 15:20:25 version 1.17, 2015/03/17 00:08:48
Line 270  sub html_classlist { Line 270  sub html_classlist {
     }      }
   
     if ($env{'form.action'} eq 'setenv') {      if ($env{'form.action'} eq 'setenv') {
         $Str .= &process_student_prefs();          $Str .= &process_student_prefs($crstype);
     }      }
   
     $Str .= '<h2>'.$heading.'</h2>';      $Str .= '<h2>'.$heading.'</h2>';
Line 297  sub html_classlist { Line 297  sub html_classlist {
   
     if ($viewsettings->{'student_opt_in'}) {      if ($viewsettings->{'student_opt_in'}) {
         if ($env{'request.role'} =~ /^st/)  {          if ($env{'request.role'} =~ /^st/)  {
             $Str .= &print_roster_form();              $Str .= &print_roster_form($crstype);
         }          }
         %publicroster = &Apache::lonnet::dump('publicroster',$cdom,$cnum);          %publicroster = &Apache::lonnet::dump('publicroster',$cdom,$cnum);
     }      }
Line 428  sub html_classlist { Line 428  sub html_classlist {
 }  }
   
 sub print_roster_form {  sub print_roster_form {
       my ($crstype) = @_;
     my $cid = $env{'request.course.id'};      my $cid = $env{'request.course.id'};
     my $showinroster = $env{'environment.internal.'.$cid.'.showinroster'};      my $showinroster = $env{'environment.internal.'.$cid.'.showinroster'};
     my ($showoff,$showon);      my ($showoff,$showon);
Line 438  sub print_roster_form { Line 439  sub print_roster_form {
         $showoff = ' checked="checked" ';          $showoff = ' checked="checked" ';
         $showon = ' ';          $showon = ' ';
     }      }
       my $singular = 'student';
       if ($crstype eq 'Community') {
           $singular = 'member';
       }
     my $output =      my $output =
         '<div class="LC_left_float">'          '<div class="LC_left_float">'
        .'<fieldset><legend>'.&mt('Your roster setting').'</legend>';         .'<fieldset><legend>'.&mt('Your roster setting').'</legend>';
     if ($showinroster) {      if ($showinroster) {
         $output .= &mt('You are currently listed in the student-viewable roster.');          $output .= &mt("You are currently listed in the $singular-viewable roster.");
     } else {      } else {
         $output .=  &mt('You are currently [_1]not[_2] listed in the student-viewable roster.','<b>','</b>');          $output .=  &mt("You are currently [_1]not[_2] listed in the $singular-viewable roster.",'<b>','</b>');
     }      }
     $output .= '<br />'.&mt('Include yourself in the roster?').'&nbsp;&nbsp;'.      $output .= '<br />'.&mt('Include yourself in the roster?').'&nbsp;&nbsp;'.
         '<form name="studentparm" method="post" action="">'.          '<form name="studentparm" method="post" action="">'.
Line 458  sub print_roster_form { Line 463  sub print_roster_form {
 }  }
   
 sub process_student_prefs {  sub process_student_prefs {
       my ($crstype) = @_;
     my $cid = $env{'request.course.id'};      my $cid = $env{'request.course.id'};
     my $cdom = $env{'course.'.$cid.'.domain'};      my $cdom = $env{'course.'.$cid.'.domain'};
     my $cnum = $env{'course.'.$cid.'.num'};      my $cnum = $env{'course.'.$cid.'.num'};
Line 474  sub process_student_prefs { Line 480  sub process_student_prefs {
     if ($pubroster{$student}) {      if ($pubroster{$student}) {
         $sturoster = 1;          $sturoster = 1;
     }      }
   
       my $singular = 'student';
       if ($crstype eq 'Community') {
           $singular = 'member';
       }
     my $output;      my $output;
     if ($sturoster ne $showinroster) {      if ($sturoster ne $showinroster) {
         my %changeHash = (          my %changeHash = (
Line 487  sub process_student_prefs { Line 498  sub process_student_prefs {
             if ($result eq 'ok') {              if ($result eq 'ok') {
                 $output .=                  $output .=
                     &Apache::lonhtmlcommon::confirm_success(                      &Apache::lonhtmlcommon::confirm_success(
                         &mt('Display of your name in the student-viewable roster set to [_1].','<b>'.$visibility.'</b>'));                          &mt("Display of your name in the $singular-viewable roster set to [_1].",'<b>'.$visibility.'</b>'));
             } else {              } else {
                 $output .=                  $output .=
                     &Apache::lonhtmlcommon::confirm_success(                      &Apache::lonhtmlcommon::confirm_success(
Line 501  sub process_student_prefs { Line 512  sub process_student_prefs {
     } else {      } else {
         $output .=          $output .=
             &Apache::lonhtmlcommon::confirm_success(              &Apache::lonhtmlcommon::confirm_success(
                 &mt('Display of your name in the student-viewable roster unchanged (set to [_1]).','<b>'.$visibility.'</b>'));                  &mt("Display of your name in the $singular-viewable roster unchanged (set to [_1]).",'<b>'.$visibility.'</b>'));
     }      }
     $output = &Apache::loncommon::confirmwrapper($output);      $output = &Apache::loncommon::confirmwrapper($output);
     return $output;      return $output;

Removed from v.1.16  
changed lines
  Added in v.1.17


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>