--- loncom/homework/edit.pm 2002/07/17 18:06:18 1.35
+++ loncom/homework/edit.pm 2003/01/28 00:14:17 1.44
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.35 2002/07/17 18:06:18 albertel Exp $
+# $Id: edit.pm,v 1.44 2003/01/28 00:14:17 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,9 +39,11 @@ use HTML::Entities();
@Apache::edit::colorlist=('#ffffff','#ff0000','#00ff00','#0000ff','#0ff000','#000ff0','#f0000f');
# depth of nesting of edit
$Apache::edit::colordepth=0;
+@Apache::edit::inserttag=();
sub initialize_edit {
$Apache::edit::colordepth=0;
+ @Apache::edit::inserttag=();
}
sub tag_start {
@@ -96,18 +98,32 @@ sub start_table {
$color = $Apache::edit::colorlist[$Apache::edit::colordepth];
}
$Apache::edit::colordepth++;
- my $result="<table bgcolor=\"$color\" width=\"100%\" border=\"5\">";
+ push(@Apache::edit::inserttag,$token->[1]);
+ my $result='<div align="right">';
+ $result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="5" cellpadding="3">';
return $result;
}
sub end_table {
$Apache::edit::colordepth--;
- my $result="</table>";
+ my $result='</table></div>';
+ $result.="<table><tr><td>";
+
+ my ($tagname,$closingtag);
+ if (defined($Apache::edit::inserttag[-2])) {
+ $tagname=$Apache::edit::inserttag[-2];
+ } else {$tagname='problem';}
+ if (defined($Apache::edit::inserttag[-1])) {
+ $closingtag=$Apache::edit::inserttag[-1];
+ }
+ $result.=&innerinsertlist('edit',$tagname,$closingtag).
+ "</td></tr></table>";
+ pop(@Apache::edit::inserttag);
return $result;
}
-sub start_spanning_row { return '<tr><td colspan="3">';}
-sub start_row { return '<tr><td>'; }
+sub start_spanning_row { return '<tr><td colspan="3" bgcolor="#DDDDDD">';}
+sub start_row { return '<tr><td bgcolor="#DDDDDD">'; }
sub end_row { return '</td></tr>'; }
sub movebuttons {
@@ -152,16 +168,16 @@ sub handle_delete {
}
sub get_insert_list {
- my ($token) = @_;
+ my ($tagname) = @_;
my $result='';
my @tagnums= ();
#&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist))));
- if ($Apache::lonxml::insertlist{"$token->[1].which"}) {
- push (@tagnums, @{ $Apache::lonxml::insertlist{"$token->[1].which"} });
+ if ($Apache::lonxml::insertlist{"$tagname.which"}) {
+ push (@tagnums, @{ $Apache::lonxml::insertlist{"$tagname.which"} });
}
foreach my $namespace (@Apache::lonxml::namespace) {
- if ($Apache::lonxml::insertlist{"$namespace".'::'."$token->[1].which"}) {
- push (@tagnums, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$token->[1].which"} });
+ if ($Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"}) {
+ push (@tagnums, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} });
}
}
if (@tagnums) {
@@ -178,12 +194,21 @@ sub get_insert_list {
sub insertlist {
my ($target,$token) = @_;
+ return &innerinsertlist($target,$token->[1]);
+}
+
+sub innerinsertlist {
+ my ($target,$tagname,$closingtag) = @_;
my $result;
+ my $after='';
+ if ($closingtag) {
+ $after='_after_'.$closingtag;
+ }
if ($target eq 'edit') {
- my $optionlist= &get_insert_list($token);
+ my $optionlist= &get_insert_list($tagname);
if ($optionlist) {
$result = "Insert:
-<select name=\"insert_$Apache::lonxml::curdepth\">
+<select name=\"insert$after\_$Apache::lonxml::curdepth\">
$optionlist
</select>"
} else {
@@ -217,6 +242,32 @@ sub handle_insert {
return $result;
}
+sub handle_insertafter {
+ my $tagname=shift;
+ if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '')
+ { return ''; }
+ my $result;
+ my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};
+ my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
+ if ($func eq 'default') {
+ my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
+ my $namespace;
+ if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }
+ $result.="\n<$newtag>\n</$newtag>";
+ } else {
+ if (defined(&$func)) {
+ {
+ no strict 'refs';
+ $result.=&$func();
+ }
+ } else {
+ my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
+ &Apache::lonxml::error("Unable to insert (after) tag $newtag, $func was not defined. ($tagname $tagnum)");
+ }
+ }
+ return $result;
+}
+
sub insert_responseparam {
return '
<responseparam />';
@@ -249,6 +300,13 @@ sub insert_stringresponse {
</stringresponse>';
}
+sub insert_essayresponse {
+ return '
+<essayresponse>
+ <textfield></textfield>
+</essayresponse>';
+}
+
sub insert_optionresponse {
return '
<optionresponse max="10">
@@ -269,6 +327,28 @@ sub insert_radiobuttonresponse {
</radiobuttonresponse>';
}
+sub insert_rankresponse {
+ return '
+<rankresponse max="10">
+ <foilgroup options="">
+ </foilgroup>
+ <hintgroup>
+ </hintgroup>
+</rankresponse>';
+}
+
+sub insert_matchresponse {
+ return '
+<matchresponse max="10">
+ <foilgroup options="">
+ <itemgroup>
+ </itemgroup>
+ </foilgroup>
+ <hintgroup>
+ </hintgroup>
+</matchresponse>';
+}
+
sub insert_displayduedate { return '<displayduedate />'; }
sub insert_displaytitle { return '<displaytitle />'; }
sub insert_hintpart {
@@ -285,6 +365,12 @@ sub insert_numericalhint {
</numericalhint>';
}
+sub insert_radiobuttonhint {
+ return '
+<radiobuttonhint>
+</radiobuttonhint>';
+}
+
sub insert_startouttext {
return "<startouttext />\n<endouttext />";
}
@@ -388,60 +474,81 @@ sub text_arg {
my $result;
if (!defined $size) { $size=20; }
my $arg=$token->[2]{$name};
- $result=$description.'<input name="'."$Apache::lonxml::curdepth.$name".
+ $result=$description.' <input name="'."$Apache::lonxml::curdepth.$name".
'" type="text" value="'.$arg.'" size="'.$size.'" />';
return $result;
}
sub select_arg {
- my ($description,$name,$list,$token) = @_;
- my $result;
- my $optionlist="";
- my $selected=$token->[2]{$name};
- foreach my $option (@$list) {
- if ( $selected eq $option ) {
- $optionlist.="<option selected=\"on\">$option</option>\n";
- } else {
- $optionlist.="<option>$option</option>\n";
+ my ($description,$name,$list,$token) = @_;
+ my $result;
+ my $optionlist="";
+ my $selected=$token->[2]{$name};
+ foreach my $option (@$list) {
+ my $value;
+ if ( ref($option) eq 'ARRAY') {
+ $value='value="'.$$option[0].'"';
+ $option=$$option[1];
+ } else {
+ $value='value="'.$option.'"';
+ }
+ if ( $selected eq $option ) {
+ $optionlist.="<option $value selected=\"on\">$option</option>\n";
+ } else {
+ $optionlist.="<option $value >$option</option>\n";
+ }
}
- }
- $result.=$description.'<select name="'."$Apache::lonxml::curdepth.$name".'">
+ $result.=$description.' <select name="'.
+ "$Apache::lonxml::curdepth.$name".'">
'.$optionlist.'
</select>';
- return $result;
+ return $result;
}
sub select_or_text_arg {
- my ($description,$name,$list,$token,$size) = @_;
- my $result;
- my $optionlist="";
- my $found=0;
- my $selected=$token->[2]{$name};
- foreach my $option (@$list) {
- if ( $selected eq $option ) {
- $optionlist.="<option selected=\"on\">$option</option>\n";
- $found=1;
- } else {
- $optionlist.="<option>$option</option>\n";
- }
- }
- $optionlist.="<option value=\"TYPEDINVALUE\">Type in value</option>\n";
- if (($found) || (!$selected)) {
- $result.=$description.'<select name="'."$Apache::lonxml::curdepth.$name".'">
+ my ($description,$name,$list,$token,$size) = @_;
+ my $result;
+ my $optionlist="";
+ my $found=0;
+ my $selected=$token->[2]{$name};
+ foreach my $option (@$list) {
+ my $value;
+ if ( ref($option) eq 'ARRAY') {
+ $value='value="'.$$option[0].'"';
+ $option=$$option[1];
+ } else {
+ $value='value="'.$option.'"';
+ }
+ if ( $selected eq $option ) {
+ $optionlist.="<option $value selected=\"on\">$option</option>\n";
+ $found=1;
+ } else {
+ $optionlist.="<option $value>$option</option>\n";
+ }
+ }
+ $optionlist.="<option value=\"TYPEDINVALUE\">Type in value</option>\n";
+ if (($found) || (!$selected)) {
+ $result.=$description.' <select name="'."$Apache::lonxml::curdepth.$name".'">
'.$optionlist.'
</select>';
- } else {
- $result.=&text_arg($description,$name,$token,$size);
- }
- return $result;
+ } else {
+ $result.=&text_arg($description,$name,$token,$size);
+ }
+ return $result;
}
#----------------------------------------------------- browse
sub browse {
# insert a link to call up the filesystem browser (lonindexer)
- $_ = shift;
+ my ($id, $mode) = @_;
my $form = 'lonhomework';
- my $element = &Apache::lonnet::escape("$Apache::lonxml::curdepth.$_");
+ my $element;
+ if (! defined($mode) || $mode eq 'attribute') {
+ $element = &Apache::lonnet::escape("$Apache::lonxml::curdepth.$id");
+ } elsif ($mode eq 'textnode') { # for data between <tag> ... </tag>
+ $element = &Apache::lonnet::escape('homework_edit_'.
+ $Apache::lonxml::curdepth);
+ }
my $result = <<"ENDBUTTON";
<a href=\"javascript:openbrowser('$form','$element')\"\>Browse</a>
ENDBUTTON