[BACK]Return to lonpreferences.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpreferences.pm between versions 1.168 and 1.172

version 1.168, 2009/08/12 20:43:18 version 1.172, 2009/10/01 22:41:55
Line 1356  sub client_form { Line 1356  sub client_form {
                 'currentpass' => 'Current Password',                  'currentpass' => 'Current Password',
                 'newpass' => 'New Password',                  'newpass' => 'New Password',
                 'confirmpass' => 'Confirm Password',                  'confirmpass' => 'Confirm Password',
                 'changepass' => 'Save');                  'changepass' => 'Save',
       );
   
     my $output = '<form name="client">'      my $output = '<form name="client">'
                 .&Apache::lonhtmlcommon::start_pick_box();                  .&Apache::lonhtmlcommon::start_pick_box();
Line 1565  ENDERROR Line 1566  ENDERROR
     # Inform the user the password has (not?) been changed      # Inform the user the password has (not?) been changed
     my $message;      my $message;
     if ($result =~ /^ok$/) {      if ($result =~ /^ok$/) {
         $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'<i>'));          $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'</i>'));
         if ($caller eq 'reset_by_email') {          if ($caller eq 'reset_by_email') {
             $r->print($message.'<br />');              $r->print($message.'<br />');
         } else {          } else {
Line 1607  sub discussionchanger { Line 1608  sub discussionchanger {
         }          }
     }      }
     if (defined($userenv{'discmarkread'})) {      if (defined($userenv{'discmarkread'})) {
         unless ($userenv{'discdisplay'} eq '') {           unless ($userenv{'discmarkread'} eq '') { 
             $discmark = $userenv{'discmarkread'};              $discmark = $userenv{'discmarkread'};
         }          }
     }      }
Line 1651  sub discussionchanger { Line 1652  sub discussionchanger {
         $currmark = $lt{'ondisp'};          $currmark = $lt{'ondisp'};
         $newmark = 'onmark';          $newmark = 'onmark';
     }      }
       
     $r->print(<<"END");      $r->print(<<"END");
 <form name="prefs" action="/adm/preferences" method="post">  <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_discussion" />  <input type="hidden" name="action" value="verify_and_change_discussion" />
Line 1700  sub verify_and_change_discussion { Line 1701  sub verify_and_change_discussion {
     if (defined($env{'form.discdisp'}) ) {      if (defined($env{'form.discdisp'}) ) {
         my $newdisp  = $env{'form.newdisp'};          my $newdisp  = $env{'form.newdisp'};
         if ($newdisp eq 'unread') {          if ($newdisp eq 'unread') {
             $message .=&mt('In discussions: only new posts will be displayed.').'<br />';              $message .=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: only new posts will be displayed.')).'<br />';
             &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});              &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
             &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});              &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
         } else {          } else {
             $message .= &mt('In discussions: all posts will be displayed.').'<br />';              $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: all posts will be displayed.')).'<br />';
             &Apache::lonnet::del('environment',['discdisplay']);              &Apache::lonnet::del('environment',['discdisplay']);
             &Apache::lonnet::delenv('environment.discdisplay');              &Apache::lonnet::delenv('environment.discdisplay');
         }          }
Line 1943  push(@{ $menu[1]->{items} }, { Line 1944  push(@{ $menu[1]->{items} }, {
  url => '/adm/remote?url=/adm/preferences&amp;action=launch',   url => '/adm/remote?url=/adm/preferences&amp;action=launch',
  permission => 'F',   permission => 'F',
  #help => '',   #help => '',
  icon => 'network-wireless.png',   icon => 'remotecontrol.png',
  linktitle => 'Launch the remote control for LON-CAPA.',   linktitle => 'Launch the remote control for LON-CAPA.',
  });   });
     }else{      }else{
Line 1952  push(@{ $menu[1]->{items} }, { Line 1953  push(@{ $menu[1]->{items} }, {
  url => '/adm/remote?url=/adm/preferences&amp;action=collapse',   url => '/adm/remote?url=/adm/preferences&amp;action=collapse',
  permission => 'F',   permission => 'F',
  #help => '',   #help => '',
  icon => 'network-wireless.png',   icon => 'remotecontrol.png',
  linktitle => 'Collapse the remote control for LON-CAPA.',   linktitle => 'Collapse the remote control for LON-CAPA.',
  });   });
     }      }
Removed from v.1.168  
changed lines
  Added in v.1.172

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