Diff for /loncom/homework/edit.pm between versions 1.108 and 1.135

version 1.108, 2007/06/19 20:24:42 version 1.135, 2011/08/09 16:12:21
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   =pod
   
   =head1 NAME
   
   Apache::edit - edit mode helpers
   
   =head1 SYNOPSIS
   
   Invoked by many homework and xml related modules.
   
    &Apache::edit::SUBROUTINENAME(ARGUMENTS);
   
   =head1 INTRODUCTION
   
   This module outputs HTML syntax helpful for the rendering of edit
   mode interfaces.
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   =head1 SUBROUTINES
   
   =over 4
   
   =item initialize_edit() 
   
   initialize edit (set colordepth to zero)
   
   =item tag_start($target,$token,$description)
   
   provide deletion and insertion lists
   for the manipulation of a start tag; return a scalar string
   
   =item tag_end($target,$token,$description)
   
   ending syntax corresponding to
   &tag_start. return a scalar string.
   
   =item  start_table($token)
   
   start table; update colordepth; return scalar string.
   
   =item end_table()
   
   reduce color depth; end table; return scalar string
   
   =item start_spanning_row()
   
   start a new table row spanning the 'edit' environment.
   
   =item start_row()
   
   start a new table row and element. 
   
   =item end_row() 
   
   end current table element and row.
   
   =item movebuttons($target,$token)
   
   move-up and move-down buttons; return scalar string
   
   =item deletelist($target,$token)
   
   provide a yes option in an HTML select element; return scalar string
   
   =item handle_delete($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,
   $style)
   
   respond to a user delete request by passing relevant stack
   and array information to various rendering functions; return a scalar string
   
   =item get_insert_list($token)
   
   provide an insertion list based on possibilities from lonxml; return a scalar string
   
   =item insertlist($target,$token)
   
   api that uses get_insert_list; return a scalar string
   
   =item handleinsert($token)
   
   provide an insertion list based on possibilities from lonxml; return a scalar string
   
   =item get_insert_list($token)
   
   provide an insertion list based on possibilities from lonxml; return a scalar string
   
   =item browse($elementname)
   
   provide a link which will open up the filesystem browser (lonindexer) and, once a file is selected, place the result in the form element $elementname.
   
   =item search($elementname)
   
   provide a link which will open up the filesystem searcher (lonsearchcat) and, once a file is selected, place the result in the form element $elementname.
   
   =item editline(tag,data,description,size)
   
   Provide a <input type="text" ../> for single-line text entry.  This is to be used for text enclosed by tags, not arguements/parameters associated with a tag.
   
   =back
   
   =cut
   
 package Apache::edit;   package Apache::edit; 
   
 use strict;  use strict;
Line 61  sub tag_start { Line 165  sub tag_start {
     if (!$description) { $description="&lt;$tag&gt;"; }      if (!$description) { $description="&lt;$tag&gt;"; }
  }   }
  $result.= &start_table($token)."<tr><td>$description</td>   $result.= &start_table($token)."<tr><td>$description</td>
                       <td>Delete".                        <td>".&mt('Delete?').' '.
       &deletelist($target,$token)        &deletelist($target,$token)
       ."</td>        ."</td>
                        <td>".                         <td>".
Line 100  sub start_table { Line 204  sub start_table {
     $Apache::edit::colordepth++;      $Apache::edit::colordepth++;
     push(@Apache::edit::inserttag,$token->[1]);      push(@Apache::edit::inserttag,$token->[1]);
     my $result='<div align="right">';      my $result='<div align="right">';
     $result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="5" cellpadding="3">';      $result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="3" cellpadding="2">';
     return $result;      return $result;
 }  }
   
Line 128  sub end_table { Line 232  sub end_table {
     return $result;      return $result;
 }  }
   
 sub start_spanning_row { return '<tr><td colspan="4" bgcolor="#DDDDDD">';}  sub start_spanning_row { return '<tr><td colspan="5" bgcolor="#F0F0F0">';}
 sub start_row          { return '<tr><td bgcolor="#DDDDDD">';            }  sub start_row          { return '<tr><td bgcolor="#DDDDDD">';            }
 sub end_row            { return '</td></tr>';          }  sub end_row            { return '</td></tr>';          }
   
Line 145  sub deletelist { Line 249  sub deletelist {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $result = "<select name=\"delete_$Apache::lonxml::curdepth\">      my $result = "<select name=\"delete_$Apache::lonxml::curdepth\">
 <option></option>  <option></option>
 <option>Yes</option>  <option>".&mt('yes')."</option>
 </select>";  </select>";
     return $result;      return $result;
 }  }
Line 215  sub innerinsertlist { Line 319  sub innerinsertlist {
     if ($target eq 'edit') {      if ($target eq 'edit') {
  my $optionlist= &get_insert_list($tagname);   my $optionlist= &get_insert_list($tagname);
  if ($optionlist) {   if ($optionlist) {
     $result = "Insert:      $result = &mt('Insert:')."
             <select name=\"insert$after\_$Apache::lonxml::curdepth\">              <select name=\"insert$after\_$Apache::lonxml::curdepth\">
                   $optionlist                    $optionlist
             </select>"              </select>"
Line 253  sub do_insert { Line 357  sub do_insert {
  my $depth = scalar(@Apache::lonxml::depthcounter);   my $depth = scalar(@Apache::lonxml::depthcounter);
  $depth -- if ($after);   $depth -- if ($after);
  my $inset = "\t"x$depth;   my $inset = "\t"x$depth;
  $result.="\n$inset<$newtag>\n$inset</$newtag>";   $result.="\n$inset<$newtag></$newtag>";
     } else {      } else {
  if (defined(&$func)) {   if (defined(&$func)) {
     {      {
Line 293  sub insert_formularesponse { Line 397  sub insert_formularesponse {
 </formularesponse>';  </formularesponse>';
 }  }
   
   sub insert_functionplotresponse {
       return '
   <functionplotresponse>
   <functionplotelements>
   <spline />
   </functionplotelements>
   <functionplotruleset>
   <functionplotrule />
   </functionplotruleset>
   </functionplotresponse>';
   }
   
   sub insert_spline {
       return '
   <spline />';
   }
   
   sub insert_backgroundplot {
       return '
   <backgroundplot />';
   }
   
   sub insert_functionplotrule {
       return '
   <functionplotrule />';
   }
   
   sub insert_functionplotruleset {
       return '
   <functionplotruleset>
   <functionplotrule />
   </functionplotruleset>';
   }
   
   sub insert_functionplotelements {
       return '
   <functionplotelements>
   <spline />
   </functionplotelements>';
   }
   
 sub insert_numericalresponse {  sub insert_numericalresponse {
     return '      return '
 <numericalresponse answer="">  <numericalresponse answer="">
Line 488  sub insert_matchresponse { Line 633  sub insert_matchresponse {
 </matchresponse>';  </matchresponse>';
 }  }
   
   sub insert_startpartmarker { return '<startpartmarker />'; }
   sub insert_endpartmarker { return '<endpartmarker />'; }
   
 sub insert_displayduedate { return '<displayduedate />'; }  sub insert_displayduedate { return '<displayduedate />'; }
 sub insert_displaytitle   { return '<displaytitle />'; }  sub insert_displaytitle   { return '<displaytitle />'; }
 sub insert_hintpart {  sub insert_hintpart {
Line 510  sub insert_numericalhint { Line 658  sub insert_numericalhint {
 </numericalhint>';  </numericalhint>';
 }  }
   
   sub insert_reactionhint {
       return '
   <reactionhint>
   </reactionhint>';
   }
   
   sub insert_organichint {
       return '
   <organichint>
   </organichint>';
   }
   
 sub insert_stringhint {  sub insert_stringhint {
     return '      return '
 <stringhint>  <stringhint>
Line 577  sub element_change_detection { Line 737  sub element_change_detection {
 }  }
   
 sub submit_ask_anyway {  sub submit_ask_anyway {
     return ' onclick="still_ask=true;" ';      my ($extra_action) = @_;
       return ' onclick="still_ask=true;'.$extra_action.'" ';
 }  }
   
   sub submit_dont_ask {
       my ($extra_action) = @_;
       return ' onclick="is_submit=true;'.$extra_action.'" ';
   }
   
   
 sub textarea_sizes {  sub textarea_sizes {
     my ($data)=@_;      my ($data)=@_;
     my $count=0;      my $count=0;
Line 597  sub textarea_sizes { Line 764  sub textarea_sizes {
 sub editline {  sub editline {
     my ($tag,$data,$description,$size)=@_;      my ($tag,$data,$description,$size)=@_;
     $data=&HTML::Entities::encode($data,'<>&"');      $data=&HTML::Entities::encode($data,'<>&"');
     if ($description) { $description="<br />".$description."<br />"; }      if ($description) { $description=$description."<br />"; }
     my $change_code = &element_change_detection();      my $change_code = &element_change_detection();
     my $result = <<"END";      my $result = <<"END";
 $description  $description
Line 611  sub editfield { Line 778  sub editfield {
     my ($tag,$data,$description,$minwidth,$minheight,$usehtmlarea)=@_;      my ($tag,$data,$description,$minwidth,$minheight,$usehtmlarea)=@_;
   
     my ($rows,$cols)=&textarea_sizes(\$data);      my ($rows,$cols)=&textarea_sizes(\$data);
     if (&Apache::lonhtmlcommon::htmlareabrowser() &&      my $textareaclass;
  !&Apache::lonhtmlcommon::htmlareablocked()) {   
       if (&Apache::lonhtmlcommon::htmlareabrowser() && $usehtmlarea) { 
  $rows+=7;      # make room for HTMLarea   $rows+=7;      # make room for HTMLarea
  $minheight+=7; # make room for HTMLarea   $minheight+=7; # make room for HTMLarea
           $textareaclass = ' class="LC_richDefaultOff"';
     }      }
     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=$description."<br />"; }
     if ($usehtmlarea) {  
  &Apache::lonhtmlcommon::add_htmlareafields('homework_edit_'.  
    $Apache::lonxml::curdepth);  
     }  
     # remove typesetting whitespace from between data and the end tag      # remove typesetting whitespace from between data and the end tag
     # to make the edit look prettier      # to make the edit look prettier
     $data =~ s/\n?[ \t]*$//;      $data =~ s/\n?[ \t]*$//;
   
     return $description."\n".'<textarea style="width:100%" rows="'.$rows.      return $description."\n".'<textarea style="width:99%" rows="'.$rows.
  '" cols="'.$cols.'" name="homework_edit_'.   '" cols="'.$cols.'" name="homework_edit_'.
  $Apache::lonxml::curdepth.'" id="homework_edit_'.   $Apache::lonxml::curdepth.'" id="homework_edit_'.
  $Apache::lonxml::curdepth.'" '.&element_change_detection().'>'.   $Apache::lonxml::curdepth.'" '.&element_change_detection().
           $textareaclass.'>'.
  &HTML::Entities::encode($data,'<>&"').'</textarea>'.   &HTML::Entities::encode($data,'<>&"').'</textarea>'.
  ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',   ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
  'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";   'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
Line 672  sub get_new_args { Line 839  sub get_new_args {
  $token->[2]->{$arg}=$newvalue;   $token->[2]->{$arg}=$newvalue;
     }      }
     $rebuild=1;      $rebuild=1;
       # add new attributes to the of the attribute seq
       if (!grep { $arg eq $_ } (@{ $token->[3] })) {
    push(@{ $token->[3] },$arg);
       }
  } elsif (!defined($newvalue) && defined($value)) {   } elsif (!defined($newvalue) && defined($value)) {
     delete($token->[2]->{$arg});      delete($token->[2]->{$arg});
     $rebuild=1;      $rebuild=1;
Line 686  sub rebuild_tag { Line 857  sub rebuild_tag {
     my $result;      my $result;
     if ($token->[0] eq 'S') {      if ($token->[0] eq 'S') {
  $result = '<'.$token->[1];   $result = '<'.$token->[1];
  while (my ($key,$val)= each(%{$token->[2]})) {   foreach my $attribute (@{ $token->[3] }) {
     $val=~s:^\s+|\s+$::g;      my $value = $token->[2]{$attribute};
     $val=~s:"::g; #"      next if ($value eq '');
     &Apache::lonxml::debug("setting :$key: to  :$val:");      $value =~s/^\s+|\s+$//g;
     $result.=' '.$key.'="'.$val.'"';      $value =~s/\"//g;
       &Apache::lonxml::debug("setting :$attribute: to  :$value:");
       $result.=' '.$attribute.'="'.$value.'"';
  }   }
  if ($token->[4] =~ m:/>$:) {   if ($token->[4] =~ m:/>$:) {
     $result.=' />';      $result.=' />';
Line 733  sub checked_arg { Line 906  sub checked_arg {
     $text=$option;      $text=$option;
     $value='value="'.$option.'"';      $value='value="'.$option.'"';
  }   }
  $result.="<nobr><label><input type='checkbox' $value name='".   $result.='<span class="LC_nobreak"><label><input type="checkbox" '.$value.' name="'.
     &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='checked' ";   $result.=' checked="checked" ';
  last;   last;
     }      }
  }   }
  $result.=&element_change_detection()." />$text</label></nobr>\n";   $result.=&element_change_detection().' />'.$text.'</label></span>'."\n";
     }      }
     return $result;      return $result;
 }  }
Line 754  sub text_arg { Line 927  sub text_arg {
     $result=&mt($description).'&nbsp;<input name="'.&html_element_name($name).      $result=&mt($description).'&nbsp;<input name="'.&html_element_name($name).
  '" type="text" value="'.$arg.'" size="'.$size.'" '.   '" type="text" value="'.$arg.'" size="'.$size.'" '.
  &element_change_detection().'/>';   &element_change_detection().'/>';
     return '<nobr>'.$result.'</nobr>';      return '<span class="LC_nobreak">'.$result.'</span>';
 }  }
   
 sub select_arg {  sub select_arg {
Line 762  sub select_arg { Line 935  sub select_arg {
     my $result;      my $result;
     my $optionlist="";      my $optionlist="";
     my $selected=$token->[2]{$name};      my $selected=$token->[2]{$name};
     foreach my $option (@$list) {      if (ref($list) eq 'ARRAY') {
  my ($text,$value);          foreach my $option (@{$list}) {
  if ( ref($option) eq 'ARRAY') {      my ($text,$value);
     $value='value="'.&HTML::Entities::encode($$option[0]).'"';      if (ref($option) eq 'ARRAY') {
     $text=$$option[1];          $value='value="'.&HTML::Entities::encode($option->[0]).'"';
     $option=$$option[0];          $text=$option->[1];
  } else {          $option=$option->[0];
     $text=$option;      } else {
     $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';          $text=$option;
  }          $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
  if ( $selected eq $option ) {      }
     $optionlist.="<option $value selected=\"selected\">$text</option>\n";      if ( $selected eq $option ) {
  } else {          $optionlist.="<option $value selected=\"selected\">".&mt($text)."</option>\n";
     $optionlist.="<option $value >$text</option>\n";      } else {
  }          $optionlist.="<option $value >".&mt($text)."</option>\n";
       }
           }
     }      }
     $result.='<nobr>'.$description.'&nbsp;<select name="'.      $result.='<span class="LC_nobreak">'.&mt($description).'&nbsp;<select name="'.
  &html_element_name($name).'" '.&element_change_detection().' >   &html_element_name($name).'" '.&element_change_detection().' >
        '.$optionlist.'         '.$optionlist.'
       </select></nobr>';        </select></span>';
     return $result;      return $result;
 }  }
   
Line 791  sub select_or_text_arg { Line 966  sub select_or_text_arg {
     my $optionlist="";      my $optionlist="";
     my $found=0;      my $found=0;
     my $selected=$token->[2]{$name};      my $selected=$token->[2]{$name};
     foreach my $option (@$list) {      if (ref($list) eq 'ARRAY') {
  my ($text,$value);          foreach my $option (@{$list}) {
  if ( ref($option) eq 'ARRAY') {      my ($text,$value);
     $value='value="'.&HTML::Entities::encode($$option[0]).'"';      if (ref($option) eq 'ARRAY') {
     $text=$$option[1];          $value='value="'.&HTML::Entities::encode($option->[0]).'"';
     $option=$$option[0];          $text=$option->[1];
  } else {          $option=$option->[0];
     $text=$option;      } else {
     $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';          $text=$option;
  }          $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
  if ( $selected eq $option ) {      }
     $optionlist.="<option $value selected=\"selected\">$text</option>\n";      if ( $selected eq $option ) {
     $found=1;          $optionlist.="<option $value selected=\"selected\">$text</option>\n";
  } else {          $found=1;
     $optionlist.="<option $value>$text</option>\n";      } else {
  }          $optionlist.="<option $value>$text</option>\n";
       }
           }
     }      }
     $optionlist.="<option value=\"TYPEDINVALUE\"".      $optionlist.="<option value=\"TYPEDINVALUE\"".
   ((!$found)?' selected="selected"':'').    ((!$found)?' selected="selected"':'').
Line 827  sub select_or_text_arg { Line 1004  sub select_or_text_arg {
     $description=&mt($description);      $description=&mt($description);
 #  #
     return (<<ENDSELECTORTYPE);      return (<<ENDSELECTORTYPE);
 <nobr>  <span class="LC_nobreak">
 $description  $description
 &nbsp;<select name="$selectelement"  &nbsp;<select name="$selectelement"
 onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }" >  onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }" >
Line 838  $optionlist Line 1015  $optionlist
 onChange="$hiddenvalue=$typedinvalue;"  onChange="$hiddenvalue=$typedinvalue;"
 onFocus="$selectedindex=$selecttypeinindex-1;" />  onFocus="$selectedindex=$selecttypeinindex-1;" />
 <input type="hidden" name="$element" value="$selected" $change_code />  <input type="hidden" name="$element" value="$selected" $change_code />
 </nobr>  </span>
 ENDSELECTORTYPE  ENDSELECTORTYPE
 }  }
   
Line 873  sub entercoords { Line 1050  sub entercoords {
  $data{"imagechoice.$id.formwidth"}=$width.'_'.   $data{"imagechoice.$id.formwidth"}=$width.'_'.
     $Apache::edit::bgimgsrccurdepth;      $Apache::edit::bgimgsrccurdepth;
     }      }
     &Apache::lonnet::appenv(%data);      &Apache::lonnet::appenv(\%data);
     my $text="Click Coordinates";      my $text="Click Coordinates";
     my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';      my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
     return $result;      return $result;
Line 906  sub entercoord { Line 1083  sub entercoord {
  $data{"imagechoice.$id.formwidth"}=$width.'_'.   $data{"imagechoice.$id.formwidth"}=$width.'_'.
     $Apache::edit::bgimgsrccurdepth;      $Apache::edit::bgimgsrccurdepth;
     }      }
     &Apache::lonnet::appenv(%data);      &Apache::lonnet::appenv(\%data);
     my $text="Enter Coordinates";      my $text="Enter Coordinates";
     if ($type eq 'polygon') { $text='Create Polygon Data'; }      if ($type eq 'polygon') { $text='Create Polygon Data'; }
     my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';      my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
Line 914  sub entercoord { Line 1091  sub entercoord {
 }  }
   
 sub deletecoorddata {  sub deletecoorddata {
     &Apache::lonnet::delenv("imagechoice\\.");      &Apache::lonnet::delenv('imagechoice.');
 }  }
   
 #----------------------------------------------------- browse  #----------------------------------------------------- browse
Line 967  ENDBUTTON Line 1144  ENDBUTTON
 1;  1;
 __END__  __END__
   
 =head1 NAME  
   
 Apache::edit - edit mode helpers  
   
 =head1 SYNOPSIS  
   
 Invoked by many homework and xml related modules.  
   
  &Apache::edit::SUBROUTINENAME(ARGUMENTS);  
   
 =head1 INTRODUCTION  
   
 This module outputs HTML syntax helpful for the rendering of edit  
 mode interfaces.  
   
 This is part of the LearningOnline Network with CAPA project  
 described at http://www.lon-capa.org.  
   
 =head1 HANDLER SUBROUTINE  
   
 There is no handler subroutine.  
   
 =head1 OTHER SUBROUTINES  
   
 =over 4  
   
 =item *  
   
 initialize_edit() : initialize edit (set colordepth to zero)  
   
 =item *  
   
 tag_start($target,$token,$description) : provide deletion and insertion lists  
 for the manipulation of a start tag; return a scalar string  
   
 =item *  
   
 tag_end($target,$token,$description) : ending syntax corresponding to  
 &tag_start. return a scalar string.  
   
 =item *  
   
 start_table($token) : start table; update colordepth; return scalar string.  
   
 =item *  
   
 end_table() : reduce color depth; end table; return scalar string  
   
 =item *  
   
 start_spanning_row() : start a new table row spanning the 'edit' environment.  
   
 =item *  
   
 start_row() : start a new table row and element.   
   
 =item *  
   
 end_row() : end current table element and row.  
   
 =item *  
   
 movebuttons($target,$token) : move-up and move-down buttons; return scalar  
 string  
   
 =item *  
   
 deletelist($target,$token) : provide a yes option in an HTML select element;  
 return scalar string  
   
 =item *  
   
 handle_delete($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,  
 $style) : respond to a user delete request by passing relevant stack  
 and array information to various rendering functions; return a scalar string  
   
 =item *  
   
 get_insert_list($token) : provide an insertion list based on possibilities  
 from lonxml; return a scalar string  
   
 =item *  
   
 insertlist($target,$token) : api that uses get_insert_list;  
 return a scalar string  
   
 =item *  
   
 handleinsert($token) : provide an insertion list based on possibilities  
 from lonxml; return a scalar string  
   
 =item *  
   
 get_insert_list($token) : provide an insertion list based on possibilities  
 from lonxml; return a scalar string  
   
 =item *  
 browse($elementname) : provide a link which will open up the filesystem  
 browser (lonindexer) and, once a file is selected, place the result in  
 the form element $elementname.  
   
 =item *  
 search($elementname) : provide a link which will open up the filesystem  
 searcher (lonsearchcat) and, once a file is selected, place the result in  
 the form element $elementname.  
   
 =item *  
 editline(tag,data,description,size): Provide a <input type="text" ../> for  
 single-line text entry.  This is to be used for text enclosed by tags, not  
 arguements/parameters associated with a tag.  
   
 =back  
   
 incomplete...  
   
 =cut  

Removed from v.1.108  
changed lines
  Added in v.1.135


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