Diff for /loncom/interface/lonparmset.pm between versions 1.228 and 1.231

version 1.228, 2005/06/18 14:39:24 version 1.231, 2005/06/20 14:13:00
Line 260  sub rulescache { Line 260  sub rulescache {
     return $rules{$id};      return $rules{$id};
 }  }
   
   sub preset_defaults {
       my $type=shift;
       if (&rulescache($type.'_action') eq 'default') {
   # yes, there is something
    return (&rulescache($type.'_hours'),
    &rulescache($type.'_min'),
    &rulescache($type.'_sec'),
    &rulescache($type.'_value'));
       } else {
   # nothing there or something else
    return ('','','','','');
       }
   }
   
 ##################################################  ##################################################
 ##################################################  ##################################################
 #  #
Line 510  sub plink { Line 524  sub plink {
             $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};              $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
         }          }
     }      }
       my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
       my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
       unless (defined($winvalue)) { $winvalue=$val; }
     return       return 
  '<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"   '<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
     .$marker."','".$return."','".$call."'".');">'.      .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
  &valout($value,$type).'</a><a name="'.$marker.'"></a>';   &valout($value,$type).'</a><a name="'.$marker.'"></a>';
 }  }
   
Line 614  sub print_row { Line 629  sub print_row {
     } else {          } else {    
         $parm=~s|\[.*\]\s||g;          $parm=~s|\[.*\]\s||g;
     }      }
       my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
       if ($automatic) {
    $parm.='<font color="red"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</font>';
       }
     $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');      $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
         
     my $thismarker=$which;      my $thismarker=$which;
Line 985  sub displaymenu { Line 1003  sub displaymenu {
   
 sub mapmenu {  sub mapmenu {
     my ($r,$allmaps,$pschp,$maptitles)=@_;      my ($r,$allmaps,$pschp,$maptitles)=@_;
     $r->print(&mt('Select Enclosing Map or Folder').' ');      $r->print('<b>'.&mt('Select Enclosing Map or Folder').'</b> ');
     $r->print('<select name="pschp">');      $r->print('<select name="pschp">');
     $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');      $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
     foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {      foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
Line 998  sub mapmenu { Line 1016  sub mapmenu {
   
 sub levelmenu {  sub levelmenu {
     my ($r,$alllevs,$parmlev)=@_;      my ($r,$alllevs,$parmlev)=@_;
     $r->print(&mt('Select Parameter Level').      $r->print('<b>'.&mt('Select Parameter Level').
       &Apache::loncommon::help_open_topic('Course_Parameter_Levels').' ');        &Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</b> ');
     $r->print('<select name="parmlev">');      $r->print('<select name="parmlev">');
     foreach (reverse sort keys %{$alllevs}) {      foreach (reverse sort keys %{$alllevs}) {
  $r->print('<option value="'.$$alllevs{$_}.'"');   $r->print('<option value="'.$$alllevs{$_}.'"');
Line 2207  sub listdata { Line 2225  sub listdata {
  $oldpart=$part;   $oldpart=$part;
     }      }
 #  #
   # Preset defaults?
   #
               my ($hour,$min,$sec,$val)=('','','','');
       unless ($$resourcedata{$thiskey}) {
    my ($parmname)=($thiskey=~/\.(\w+)$/);
    ($hour,$min,$sec,$val)=&preset_defaults($parmname);
       }
   
   #
 # Ready to print  # Ready to print
 #  #
     $r->print(&tablestart().'<tr><td><b>'.$name.      $r->print(&tablestart().'<tr><td><b>'.$name.
Line 2220  sub listdata { Line 2247  sub listdata {
   &Apache::lonhtmlcommon::date_setter('overviewform',    &Apache::lonhtmlcommon::date_setter('overviewform',
       $jskey,        $jskey,
       $$resourcedata{$thiskey},        $$resourcedata{$thiskey},
       '',1).        '',1,'','',$hour,$min,$sec).
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'  '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'
   );    );
     } elsif ($thistype eq 'string_yesno') {      } elsif ($thistype eq 'string_yesno') {
    my $showval;
    if (defined($$resourcedata{$thiskey})) {
       $showval=$$resourcedata{$thiskey};
    } else {
       $showval=$val;
    }
  $r->print('<label><input type="radio" name="set_'.$thiskey.   $r->print('<label><input type="radio" name="set_'.$thiskey.
   '" value="yes"');    '" value="yes"');
  if ($$resourcedata{$thiskey} eq 'yes') {   if ($showval eq 'yes') {
     $r->print(' checked="checked"');      $r->print(' checked="checked"');
  }   }
                 $r->print(' />'.&mt('Yes').'</label> ');                  $r->print(' />'.&mt('Yes').'</label> ');
  $r->print('<label><input type="radio" name="set_'.$thiskey.   $r->print('<label><input type="radio" name="set_'.$thiskey.
   '" value="no"');    '" value="no"');
  if ($$resourcedata{$thiskey} eq 'no') {   if ($showval eq 'no') {
     $r->print(' checked="checked"');      $r->print(' checked="checked"');
  }   }
                 $r->print(' />'.&mt('No').'</label>');                  $r->print(' />'.&mt('No').'</label>');
     } else {      } else {
    my $showval;
    if (defined($$resourcedata{$thiskey})) {
       $showval=$$resourcedata{$thiskey};
    } else {
       $showval=$val;
    }
  $r->print('<input type="text" name="set_'.$thiskey.'" value="'.   $r->print('<input type="text" name="set_'.$thiskey.'" value="'.
   $$resourcedata{$thiskey}.'">');    $showval.'">');
     }      }
     $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.      $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
       $thistype.'">');        $thistype.'">');
Line 2262  $html Line 2301  $html
 </head>  </head>
 $bodytag  $bodytag
 $breadcrumbs  $breadcrumbs
 <form method="post" action="/adm/parmset?action=newoverview" name="parmform">  <form method="post" action="/adm/parmset?action=newoverview" name="overviewform">
 ENDOVER  ENDOVER
     my @ids=();      my @ids=();
     my %typep=();      my %typep=();
Line 2699  ENDDEFHEAD Line 2738  ENDDEFHEAD
     push @datedisplay,&mt('Automatically set earlier than ').$tempkey;      push @datedisplay,&mt('Automatically set earlier than ').$tempkey;
  }    } 
     }      }
   $r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
     &mt('Automatic setting rules apply to table mode interfaces only.'));
     $r->print("\n<table border='1'><tr><th>".&mt('Rule for parameter').'</th><th>'.      $r->print("\n<table border='1'><tr><th>".&mt('Rule for parameter').'</th><th>'.
       &mt('Action').'</th><th>'.&mt('Value').'</th></tr>');        &mt('Action').'</th><th>'.&mt('Value').'</th></tr>');
     foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {      foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {

Removed from v.1.228  
changed lines
  Added in v.1.231


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