--- loncom/homework/edit.pm 2007/06/19 19:41:52 1.107 +++ loncom/homework/edit.pm 2008/11/10 14:11:16 1.117 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.107 2007/06/19 19:41:52 banghart Exp $ +# $Id: edit.pm,v 1.117 2008/11/10 14:11:16 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,6 +26,123 @@ # http://www.lon-capa.org/ # +=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 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 + package Apache::edit; use strict; @@ -61,7 +178,7 @@ sub tag_start { if (!$description) { $description="<$tag>"; } } $result.= &start_table($token)."$description - Delete". + ".&mt('Delete?').' '. &deletelist($target,$token) ." ". @@ -128,7 +245,7 @@ sub end_table { return $result; } -sub start_spanning_row { return '';} +sub start_spanning_row { return '';} sub start_row { return ''; } sub end_row { return ''; } @@ -145,7 +262,7 @@ sub deletelist { my ($target,$token) = @_; my $result = ""; return $result; } @@ -215,7 +332,7 @@ sub innerinsertlist { if ($target eq 'edit') { my $optionlist= &get_insert_list($tagname); if ($optionlist) { - $result = "Insert: + $result = &mt('Insert:')." " @@ -577,7 +694,8 @@ sub element_change_detection { } sub submit_ask_anyway { - return ' onclick="still_ask=true;" '; + my ($extra_action) = @_; + return ' onclick="still_ask=true;'.$extra_action.'" '; } sub textarea_sizes { @@ -597,7 +715,7 @@ sub textarea_sizes { sub editline { my ($tag,$data,$description,$size)=@_; $data=&HTML::Entities::encode($data,'<>&"'); - if ($description) { $description="
".$description."
"; } + if ($description) { $description=$description."
"; } my $change_code = &element_change_detection(); my $result = <<"END"; $description @@ -619,7 +737,7 @@ sub editfield { if ($cols > 80) { $cols = 80; } if ($cols < $minwidth ) { $cols = $minwidth; } if ($rows < $minheight) { $rows = $minheight; } - if ($description) { $description="
".$description."
"; } + if ($description) { $description=$description."
"; } if ($usehtmlarea) { &Apache::lonhtmlcommon::add_htmlareafields('homework_edit_'. $Apache::lonxml::curdepth); @@ -672,6 +790,10 @@ sub get_new_args { $token->[2]->{$arg}=$newvalue; } $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)) { delete($token->[2]->{$arg}); $rebuild=1; @@ -686,11 +808,13 @@ sub rebuild_tag { my $result; if ($token->[0] eq 'S') { $result = '<'.$token->[1]; - while (my ($key,$val)= each(%{$token->[2]})) { - $val=~s:^\s+|\s+$::g; - $val=~s:"::g; #" - &Apache::lonxml::debug("setting :$key: to :$val:"); - $result.=' '.$key.'="'.$val.'"'; + foreach my $attribute (@{ $token->[3] }) { + my $value = $token->[2]{$attribute}; + next if ($value eq ''); + $value =~s/^\s+|\s+$//g; + $value =~s/\"//g; + &Apache::lonxml::debug("setting :$attribute: to :$value:"); + $result.=' '.$attribute.'="'.$value.'"'; } if ($token->[4] =~ m:/>$:) { $result.=' />'; @@ -733,11 +857,11 @@ sub checked_arg { $text=$option; $value='value="'.$option.'"'; } - $result.="'.$description.' '; @@ -873,7 +997,7 @@ sub entercoords { $data{"imagechoice.$id.formwidth"}=$width.'_'. $Apache::edit::bgimgsrccurdepth; } - &Apache::lonnet::appenv(%data); + &Apache::lonnet::appenv(\%data); my $text="Click Coordinates"; my $result=''.$text.''; return $result; @@ -906,7 +1030,7 @@ sub entercoord { $data{"imagechoice.$id.formwidth"}=$width.'_'. $Apache::edit::bgimgsrccurdepth; } - &Apache::lonnet::appenv(%data); + &Apache::lonnet::appenv(\%data); my $text="Enter Coordinates"; if ($type eq 'polygon') { $text='Create Polygon Data'; } my $result=''.$text.''; @@ -932,6 +1056,8 @@ sub browse { my $titleelement; if ($titleid) { $titleelement=",'$only','','".&escape("$titleid\_$Apache::lonxml::curdepth")."'"; + } else { + $titleelement=",'$only'"; } my $result = <<"ENDBUTTON"; Select @@ -965,119 +1091,4 @@ ENDBUTTON 1; __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 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