--- loncom/homework/edit.pm 2008/11/18 19:14:28 1.118
+++ loncom/homework/edit.pm 2011/11/22 02:13:37 1.138
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.118 2008/11/18 19:14:28 jms Exp $
+# $Id: edit.pm,v 1.138 2011/11/22 02:13:37 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,6 +26,8 @@
# http://www.lon-capa.org/
#
+=pod
+
=head1 NAME
Apache::edit - edit mode helpers
@@ -202,7 +204,7 @@ sub start_table {
$Apache::edit::colordepth++;
push(@Apache::edit::inserttag,$token->[1]);
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;
}
@@ -230,7 +232,7 @@ sub end_table {
return $result;
}
-sub start_spanning_row { return '<tr><td colspan="5" bgcolor="#DDDDDD">';}
+sub start_spanning_row { return '<tr><td colspan="5" bgcolor="#F0F0F0">';}
sub start_row { return '<tr><td bgcolor="#DDDDDD">'; }
sub end_row { return '</td></tr>'; }
@@ -355,7 +357,7 @@ sub do_insert {
my $depth = scalar(@Apache::lonxml::depthcounter);
$depth -- if ($after);
my $inset = "\t"x$depth;
- $result.="\n$inset<$newtag>\n$inset</$newtag>";
+ $result.="\n$inset<$newtag></$newtag>";
} else {
if (defined(&$func)) {
{
@@ -395,6 +397,81 @@ sub insert_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_plotobject {
+ return '
+<plotobject />';
+}
+
+sub insert_plotvector {
+ return '
+<plotvector />';
+}
+
+sub insert_functionplotrule {
+ return '
+<functionplotrule />';
+}
+
+sub insert_functionplotvectorrule {
+ return '
+<functionplotvectorrule />';
+}
+
+sub insert_functionplotvectorsumrule {
+ return '
+<functionplotvectorsumrule />';
+}
+
+sub insert_functionplotcustomrule {
+ return '
+<functionplotcustomrule>
+<answer type="loncapa/perl">
+# &fpr_val("label"), &fpr_f($x), &fpr_dfdx($x), &fpr_d2fdx2($x)
+# ($xs,$xe,$ys,$ye)=&fpr_vectorcoords("Name"), ($x,$y)=&fpr_objectcoords("Name")
+# &fpr_vectorlength("Name"), &fpr_vectorangle("Name")
+
+# Return 0 or 1
+return 1;
+</answer>
+</functionplotcustomrule>';
+}
+
+sub insert_functionplotruleset {
+ return '
+<functionplotruleset>
+<functionplotrule />
+</functionplotruleset>';
+}
+
+sub insert_functionplotelements {
+ return '
+<functionplotelements>
+<spline />
+</functionplotelements>';
+}
+
sub insert_numericalresponse {
return '
<numericalresponse answer="">
@@ -590,6 +667,9 @@ sub insert_matchresponse {
</matchresponse>';
}
+sub insert_startpartmarker { return '<startpartmarker />'; }
+sub insert_endpartmarker { return '<endpartmarker />'; }
+
sub insert_displayduedate { return '<displayduedate />'; }
sub insert_displaytitle { return '<displaytitle />'; }
sub insert_hintpart {
@@ -612,6 +692,18 @@ sub insert_numericalhint {
</numericalhint>';
}
+sub insert_reactionhint {
+ return '
+<reactionhint>
+</reactionhint>';
+}
+
+sub insert_organichint {
+ return '
+<organichint>
+</organichint>';
+}
+
sub insert_stringhint {
return '
<stringhint>
@@ -683,6 +775,12 @@ sub submit_ask_anyway {
return ' onclick="still_ask=true;'.$extra_action.'" ';
}
+sub submit_dont_ask {
+ my ($extra_action) = @_;
+ return ' onclick="is_submit=true;'.$extra_action.'" ';
+}
+
+
sub textarea_sizes {
my ($data)=@_;
my $count=0;
@@ -714,27 +812,27 @@ sub editfield {
my ($tag,$data,$description,$minwidth,$minheight,$usehtmlarea)=@_;
my ($rows,$cols)=&textarea_sizes(\$data);
- if (&Apache::lonhtmlcommon::htmlareabrowser() &&
- !&Apache::lonhtmlcommon::htmlareablocked()) {
+ my $textareaclass;
+
+ if (&Apache::lonhtmlcommon::htmlareabrowser() && $usehtmlarea) {
$rows+=7; # make room for HTMLarea
$minheight+=7; # make room for HTMLarea
+ $textareaclass = ' class="LC_richDefaultOff"';
}
if ($cols > 80) { $cols = 80; }
if ($cols < $minwidth ) { $cols = $minwidth; }
if ($rows < $minheight) { $rows = $minheight; }
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
# to make the edit look prettier
$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_'.
$Apache::lonxml::curdepth.'" id="homework_edit_'.
- $Apache::lonxml::curdepth.'" '.&element_change_detection().'>'.
+ $Apache::lonxml::curdepth.'" '.&element_change_detection().
+ $textareaclass.'>'.
&HTML::Entities::encode($data,'<>&"').'</textarea>'.
($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
@@ -842,15 +940,15 @@ sub checked_arg {
$text=$option;
$value='value="'.$option.'"';
}
- $result.="<nobr><label><input type=\"checkbox\" $value name=\"".
- &html_element_name($name)."\"";
+ $result.='<span class="LC_nobreak"><label><input type="checkbox" '.$value.' name="'.
+ &html_element_name($name).'"';
foreach my $selected (split(/,/,$allselected)) {
if ( $selected eq $option ) {
- $result.=" checked=\"checked\" ";
+ $result.=' checked="checked" ';
last;
}
}
- $result.=&element_change_detection()." />$text</label></nobr>\n";
+ $result.=&element_change_detection().' />'.$text.'</label></span>'."\n";
}
return $result;
}
@@ -863,7 +961,7 @@ sub text_arg {
$result=&mt($description).' <input name="'.&html_element_name($name).
'" type="text" value="'.$arg.'" size="'.$size.'" '.
&element_change_detection().'/>';
- return '<nobr>'.$result.'</nobr>';
+ return '<span class="LC_nobreak">'.$result.'</span>';
}
sub select_arg {
@@ -871,26 +969,28 @@ sub select_arg {
my $result;
my $optionlist="";
my $selected=$token->[2]{$name};
- foreach my $option (@$list) {
- my ($text,$value);
- if ( ref($option) eq 'ARRAY') {
- $value='value="'.&HTML::Entities::encode($$option[0]).'"';
- $text=$$option[1];
- $option=$$option[0];
- } else {
- $text=$option;
- $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
- }
- if ( $selected eq $option ) {
- $optionlist.="<option $value selected=\"selected\">".&mt($text)."</option>\n";
- } else {
- $optionlist.="<option $value >".&mt($text)."</option>\n";
- }
+ if (ref($list) eq 'ARRAY') {
+ foreach my $option (@{$list}) {
+ my ($text,$value);
+ if (ref($option) eq 'ARRAY') {
+ $value='value="'.&HTML::Entities::encode($option->[0]).'"';
+ $text=$option->[1];
+ $option=$option->[0];
+ } else {
+ $text=$option;
+ $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
+ }
+ if ( $selected eq $option ) {
+ $optionlist.="<option $value selected=\"selected\">".&mt($text)."</option>\n";
+ } else {
+ $optionlist.="<option $value >".&mt($text)."</option>\n";
+ }
+ }
}
- $result.='<nobr>'.&mt($description).' <select name="'.
+ $result.='<span class="LC_nobreak">'.&mt($description).' <select name="'.
&html_element_name($name).'" '.&element_change_detection().' >
'.$optionlist.'
- </select></nobr>';
+ </select></span>';
return $result;
}
@@ -900,22 +1000,24 @@ sub select_or_text_arg {
my $optionlist="";
my $found=0;
my $selected=$token->[2]{$name};
- foreach my $option (@$list) {
- my ($text,$value);
- if ( ref($option) eq 'ARRAY') {
- $value='value="'.&HTML::Entities::encode($$option[0]).'"';
- $text=$$option[1];
- $option=$$option[0];
- } else {
- $text=$option;
- $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
- }
- if ( $selected eq $option ) {
- $optionlist.="<option $value selected=\"selected\">$text</option>\n";
- $found=1;
- } else {
- $optionlist.="<option $value>$text</option>\n";
- }
+ if (ref($list) eq 'ARRAY') {
+ foreach my $option (@{$list}) {
+ my ($text,$value);
+ if (ref($option) eq 'ARRAY') {
+ $value='value="'.&HTML::Entities::encode($option->[0]).'"';
+ $text=$option->[1];
+ $option=$option->[0];
+ } else {
+ $text=$option;
+ $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
+ }
+ if ( $selected eq $option ) {
+ $optionlist.="<option $value selected=\"selected\">$text</option>\n";
+ $found=1;
+ } else {
+ $optionlist.="<option $value>$text</option>\n";
+ }
+ }
}
$optionlist.="<option value=\"TYPEDINVALUE\"".
((!$found)?' selected="selected"':'').
@@ -936,7 +1038,7 @@ sub select_or_text_arg {
$description=&mt($description);
#
return (<<ENDSELECTORTYPE);
-<nobr>
+<span class="LC_nobreak">
$description
<select name="$selectelement"
onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }" >
@@ -947,7 +1049,7 @@ $optionlist
onChange="$hiddenvalue=$typedinvalue;"
onFocus="$selectedindex=$selecttypeinindex-1;" />
<input type="hidden" name="$element" value="$selected" $change_code />
-</nobr>
+</span>
ENDSELECTORTYPE
}
@@ -1023,7 +1125,7 @@ sub entercoord {
}
sub deletecoorddata {
- &Apache::lonnet::delenv("imagechoice\\.");
+ &Apache::lonnet::delenv('imagechoice.');
}
#----------------------------------------------------- browse