Diff for /loncom/homework/edit.pm between versions 1.81 and 1.88

version 1.81, 2004/03/30 08:20:49 version 1.88, 2004/10/26 15:06:58
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 3/20 Guy  
 # 01/10/02 Matthew  
 # 03/06/02 Matthew  
 package Apache::edit;   package Apache::edit; 
   
 use strict;  use strict;
Line 70  sub tag_start { Line 68  sub tag_start {
 #    "</tr><tr><td colspan=\"3\">\n";  #    "</tr><tr><td colspan=\"3\">\n";
  my @help = Apache::lonxml::helpinfo($token);   my @help = Apache::lonxml::helpinfo($token);
  if ($help[0]) {   if ($help[0]) {
     $result .= '<td align="right" valign="top">' .      $result .= '</td><td align="right" valign="top">' .
  Apache::loncommon::help_open_topic(@help) .   Apache::loncommon::help_open_topic(@help);
  '</td>';   } else { $result .= "</td><td>&nbsp;"; }
  } else { $result .= "<td>&nbsp;</td>"; }  
  $result .= &end_row().&start_spanning_row();   $result .= &end_row().&start_spanning_row();
     }      }
     return $result;      return $result;
Line 193  sub get_insert_list { Line 190  sub get_insert_list {
  $descrip."</option>\n";   $descrip."</option>\n";
  }   }
  foreach my $option (sort(keys(%options))) {$result.=$options{$option};}   foreach my $option (sort(keys(%options))) {$result.=$options{$option};}
  if ($result) { $result='<option selected="on"></option>'.$result; }   if ($result) { $result='<option selected="selected"></option>'.$result; }
     }      }
     return $result;      return $result;
 }  }
Line 284  sub insert_responseparam { Line 281  sub insert_responseparam {
     <responseparam />';      <responseparam />';
 }  }
   
   sub insert_parameter {
       return '
       <parameter />';
   }
   
 sub insert_formularesponse {  sub insert_formularesponse {
     return '      return '
 <formularesponse answer="" samples="">  <formularesponse answer="" samples="">
     <textline />      <responseparam description="Numerical Tolerance" type="tolerance" default="0.00001" name="tol" />
       <textline size="25"/>
     <hintgroup>      <hintgroup>
     <startouttext /><endouttext />      <startouttext /><endouttext />
     </hintgroup>      </hintgroup>
Line 486  END Line 489  END
 }  }
   
 sub editfield {  sub editfield {
     my ($tag,$data,$description,$minwidth,$minheight)=@_;      my ($tag,$data,$description,$minwidth,$minheight,$usehtmlarea)=@_;
   
     my ($rows,$cols)=&textarea_sizes(\$data);      my ($rows,$cols)=&textarea_sizes(\$data);
       if (&Apache::lonhtmlcommon::htmlareabrowser() &&
    !&Apache::lonhtmlcommon::htmlareablocked()) {
    $rows+=7;      # make room for HTMLarea
    $minheight+=7; # make room for HTMLarea
       }
     if ($cols > 80) { $cols = 80; }      if ($cols > 80) { $cols = 80; }
     if ($cols < $minwidth ) { $cols = $minwidth; }      if ($cols < $minwidth ) { $cols = $minwidth; }
     if ($rows < $minheight) { $rows = $minheight; }      if ($rows < $minheight) { $rows = $minheight; }
     if ($description) { $description="<br />".$description."<br />"; }      if ($description) { $description="<br />".$description."<br />"; }
       if ($usehtmlarea) {
    push @Apache::lonxml::htmlareafields,'homework_edit_'.
       $Apache::lonxml::curdepth;
       }
     return $description."\n".'&nbsp;&nbsp;&nbsp;<textarea rows="'.$rows.      return $description."\n".'&nbsp;&nbsp;&nbsp;<textarea rows="'.$rows.
  '" cols="'.$cols.'" name="homework_edit_'.   '" cols="'.$cols.'" name="homework_edit_'.
    $Apache::lonxml::curdepth.'" id="homework_edit_'.
  $Apache::lonxml::curdepth.'">'.   $Apache::lonxml::curdepth.'">'.
  &HTML::Entities::encode($data,'<>&"').'</textarea>'."\n";   &HTML::Entities::encode($data,'<>&"').'</textarea>'.
    ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
    'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
 }  }
   
 sub modifiedfield {  sub modifiedfield {
Line 597  sub checked_arg { Line 612  sub checked_arg {
     &html_element_name($name)."'";      &html_element_name($name)."'";
  foreach my $selected (split(/,/,$allselected)) {   foreach my $selected (split(/,/,$allselected)) {
     if ( $selected eq $option ) {      if ( $selected eq $option ) {
  $result.=" checked='on' ";   $result.=" checked='checked' ";
  last;   last;
     }      }
  }   }
Line 632  sub select_arg { Line 647  sub select_arg {
     $value='value="'.$option.'"';      $value='value="'.$option.'"';
  }   }
  if ( $selected eq $option ) {   if ( $selected eq $option ) {
     $optionlist.="<option $value selected=\"on\">$text</option>\n";      $optionlist.="<option $value selected=\"selected\">$text</option>\n";
  } else {   } else {
     $optionlist.="<option $value >$text</option>\n";      $optionlist.="<option $value >$text</option>\n";
  }   }
Line 661  sub select_or_text_arg { Line 676  sub select_or_text_arg {
     $value='value="'.$option.'"';      $value='value="'.$option.'"';
  }   }
  if ( $selected eq $option ) {   if ( $selected eq $option ) {
     $optionlist.="<option $value selected=\"on\">$text</option>\n";      $optionlist.="<option $value selected=\"selected\">$text</option>\n";
     $found=1;      $found=1;
  } else {   } else {
     $optionlist.="<option $value>$text</option>\n";      $optionlist.="<option $value>$text</option>\n";
  }   }
     }      }
     $optionlist.="<option value=\"TYPEDINVALUE\"".      $optionlist.="<option value=\"TYPEDINVALUE\"".
   ((!$found)?' selected="on"':'').    ((!$found)?' selected="selected"':'').
   ">".&mt('Type-in value')."</option>\n";    ">".&mt('Type-in value')."</option>\n";
 #  #
     my $element=&html_element_name($name);      my $element=&html_element_name($name);

Removed from v.1.81  
changed lines
  Added in v.1.88


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