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

Diff for /loncom/interface/lonparmset.pm between versions 1.423 and 1.429

version 1.423, 2009/01/20 18:23:19 version 1.429, 2009/02/13 17:46:00
Line 848  sub plink { Line 848  sub plink {
     my ($hour,$min,$sec,$val)=&preset_defaults($parmname);      my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
     unless (defined($winvalue)) { $winvalue=$val; }      unless (defined($winvalue)) { $winvalue=$val; }
     my $valout = &valout($value,$type,1);      my $valout = &valout($value,$type,1);
       my $unencmarker = $marker;
     foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,      foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
       \$hour, \$min, \$sec) {        \$hour, \$min, \$sec) {
  $$item = &HTML::Entities::encode($$item,'"<>&');   $$item = &HTML::Entities::encode($$item,'"<>&');
  $$item =~ s/\'/\\\'/g;   $$item =~ s/\'/\\\'/g;
     }      }
     return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$marker.'" /></td></tr><tr><td align="center">'.      return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.
  '<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"   '<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
     .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.      .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
     $valout.'</a></td></tr></table>';      $valout.'</a></td></tr></table>';
Line 974  sub print_row { Line 975  sub print_row {
                   .$$part{$which}.'</td>');                    .$$part{$which}.'</td>');
     } else {          } else {    
         $parm=~s|\[.*\]\s||g;          $parm=~s|\[.*\]\s||g;
           $parm=&mt($parm);
     }      }
     my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');      my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
     if ($automatic) {      if ($automatic) {
  $parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';   $parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
     }      }
     $r->print('<td style="background-color:'.$defbgone.';">'.$parm.'</td>');      $r->print('<td>'.$parm.'</td>');
         
     my $thismarker=$which;      my $thismarker=$which;
     $thismarker=~s/^parameter\_//;      $thismarker=~s/^parameter\_//;
Line 1315  ENDSCRIPT Line 1317  ENDSCRIPT
  if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {   if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
     $r->print(' checked="checked"');      $r->print(' checked="checked"');
  }   }
  $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? &mt($$allparms{$tempkey})          my $displaykey;
                                   : &mt($tempkey))          if ($$allparms{$tempkey}=~/\S/) {
   .'</label></td>');              $displaykey = $$allparms{$tempkey};
           } else {
               $displaykey = $tempkey;
           }
           $displaykey =~ s/(\[|\])/~$1/g;
           $r->print(' />'.&mt($displaykey).'</label></td>');
   $cnt++;    $cnt++;
         if ($cnt==3) {          if ($cnt==3) {
     $r->print("</tr>\n<tr>");      $r->print("</tr>\n<tr>");
Line 1816  sub assessparms { Line 1823  sub assessparms {
     if (!$pssymb) {      if (!$pssymb) {
         $r->print('<table border="1"><tr><td>');          $r->print('<table border="1"><tr><td>');
         &levelmenu($r,\%alllevs,$parmlev);          &levelmenu($r,\%alllevs,$parmlev);
           $r->print('</td>');
  if ($parmlev ne 'general') {   if ($parmlev ne 'general') {
             $r->print('<td>');              $r->print('<td>');
     &mapmenu($r,\%allmaps,$pschp,\%maptitles);      &mapmenu($r,\%allmaps,$pschp,\%maptitles);
     $r->print('</td>');      $r->print('</td>');
  }   }
         $r->print('</td></tr></table>');          $r->print('</tr></table>');
  &displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);   &displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
     } else {      } else {
         my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);          my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
Line 2293  sub crsenv { Line 2301  sub crsenv {
  my ($name,$domain) = split(':',$user);   my ($name,$domain) = split(':',$user);
  if (!defined($user) || !defined($domain)) {   if (!defined($user) || !defined($domain)) {
     $setoutput.= '<br /> <span class="LC_error">'.      $setoutput.= '<br /> <span class="LC_error">'.
  &mt("Invalid email address specified, address must be of the form username:domain what was specified was ([_1])",$user).   &mt("Invalid e-mail address specified, address must be of the form username:domain what was specified was ([_1])",$user).
  '</span>';   '</span>';
     undef($value);      undef($value);
  } elsif (&Apache::lonnet::homeserver($user,$domain) eq 'no_host') {   } elsif (&Apache::lonnet::homeserver($user,$domain) eq 'no_host') {
     $setoutput.= '<br /> <span class="LC_error">'.      $setoutput.= '<br /> <span class="LC_error">'.
  &mt("Invalid email address specified, user [_1] is unknown.",$name).   &mt("Invalid e-mail address specified, user [_1] is unknown.",$name).
  '</span>';   '</span>';
     undef($value);      undef($value);
  }   }
Removed from v.1.423  
changed lines
  Added in v.1.429

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