--- loncom/homework/edit.pm 2010/01/31 00:47:41 1.123.4.1
+++ loncom/homework/edit.pm 2023/03/27 18:41:06 1.157
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.123.4.1 2010/01/31 00:47:41 raeburn Exp $
+# $Id: edit.pm,v 1.157 2023/03/27 18:41:06 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -134,10 +134,11 @@ package Apache::edit;
use strict;
use Apache::lonnet;
+use Apache::loncommon;
use HTML::Entities();
use Apache::lonlocal;
use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
# Global Vars
@@ -161,21 +162,18 @@ sub tag_start {
if ($target eq "edit") {
my $tag=$token->[1];
if (!$description) {
- $description=&Apache::lonxml::description($token);
+ $description=&mt(&Apache::lonxml::description($token));
if (!$description) { $description="<$tag>"; }
}
- $result.= &start_table($token)."
\n";
my @help = Apache::lonxml::helpinfo($token);
if ($help[0]) {
- $result .= ' | ' .
+ $result .= ' | '.
Apache::loncommon::help_open_topic(@help);
} else { $result .= " | "; }
$result .= &end_row().&start_spanning_row();
@@ -203,15 +201,15 @@ sub start_table {
}
$Apache::edit::colordepth++;
push(@Apache::edit::inserttag,$token->[1]);
- my $result='';
- $result.=' ';
+ my $result='';
+ $result.=' ';
return $result;
}
sub end_table {
$Apache::edit::colordepth--;
my $result=' ';
- $result.='';
+ $result.='';
my ($tagname,$closingtag);
if (defined($Apache::edit::inserttag[-2])) {
@@ -232,7 +230,10 @@ sub end_table {
return $result;
}
-sub start_spanning_row { return ' | ';}
+sub start_spanning_row {
+ return ' | ';
+}
sub start_row { return ' | '; }
sub end_row { return ' | '; }
@@ -296,7 +297,7 @@ sub get_insert_list {
my $descrip=$Apache::lonxml::insertlist{"$tag.description"};
my $tagnum =$Apache::lonxml::insertlist{"$tag.num"};
$options{$descrip} ="\n";
+ &mt($descrip)."\n";
}
foreach my $option (sort(keys(%options))) {$result.=$options{$option};}
if ($result) { $result=''.$result; }
@@ -357,7 +358,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)) {
{
@@ -397,6 +398,85 @@ sub insert_formularesponse {
';
}
+sub insert_functionplotresponse {
+ return '
+
+
+
+
+
+';
+}
+
+sub insert_spline {
+ return '
+';
+}
+
+sub insert_backgroundplot {
+ return '
+';
+}
+
+sub insert_plotobject {
+ return '
+';
+}
+
+sub insert_plotvector {
+ return '
+';
+}
+
+sub insert_drawvectorsum {
+ return '
+';
+}
+
+
+sub insert_functionplotrule {
+ return '
+';
+}
+
+sub insert_functionplotvectorrule {
+ return '
+';
+}
+
+sub insert_functionplotvectorsumrule {
+ return '
+';
+}
+
+sub insert_functionplotcustomrule {
+ return '
+
+
+# &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;
+
+';
+}
+
+sub insert_functionplotruleset {
+ return '
+
+
+';
+}
+
+sub insert_functionplotelements {
+ return '
+
+
+';
+}
+
sub insert_numericalresponse {
return '
@@ -409,6 +489,13 @@ sub insert_numericalresponse {
';
}
+sub insert_externalresponse {
+ return '
+
+
+';
+}
+
sub insert_customresponse {
return '
@@ -581,6 +668,9 @@ sub insert_matchresponse {
+ -
+
+
@@ -592,6 +682,9 @@ sub insert_matchresponse {
';
}
+sub insert_startpartmarker { return ''; }
+sub insert_endpartmarker { return ''; }
+
sub insert_displayduedate { return ''; }
sub insert_displaytitle { return ''; }
sub insert_hintpart {
@@ -662,6 +755,7 @@ sub js_change_detection {
my $unsaved=&mt("There are unsaved changes");
return (<
SCRIPT
}
@@ -694,7 +789,58 @@ sub element_change_detection {
sub submit_ask_anyway {
my ($extra_action) = @_;
- return ' onclick="still_ask=true;'.$extra_action.'" ';
+ my $resource = &Apache::loncommon::escape_single($env{'request.ambiguous'});
+ return ' onclick="saveScrollPosition(\''.$resource.'\');still_ask=true;'.$extra_action.';" ';
+}
+
+sub submit_dont_ask {
+ my ($extra_action) = @_;
+ my $resource = &Apache::loncommon::escape_single($env{'request.ambiguous'});
+ return ' onclick="saveScrollPosition(\''.$resource.'\');is_submit=true;'.$extra_action.';" ';
+}
+
+sub js_update_linknum {
+ return (<
+SCRIPT
+
}
sub textarea_sizes {
@@ -728,30 +874,30 @@ 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." "; }
- if ($usehtmlarea) {
- &Apache::lonhtmlcommon::add_htmlareafields('homework_edit_'.
- $Apache::lonxml::curdepth);
- }
+ if ($description) { $description=' '.&mt($description).' '; }
+
# remove typesetting whitespace from between data and the end tag
# to make the edit look prettier
$data =~ s/\n?[ \t]*$//;
- return $description."\n".''.
- ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
- 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
+ ($usehtmlarea?' '.&Apache::lonhtmlcommon::spelllink('lonhomework',
+ 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
}
sub modifiedfield {
@@ -841,7 +987,7 @@ sub hidden_arg {
}
sub checked_arg {
- my ($description,$name,$list,$token) = @_;
+ my ($description,$name,$list,$token,$onclick,$useid) = @_;
my $result;
my $optionlist="";
my $allselected=$token->[2]{$name};
@@ -850,13 +996,13 @@ sub checked_arg {
my ($value,$text);
if ( ref($option) eq 'ARRAY') {
$value='value="'.$$option[0].'"';
- $text=$$option[1];
+ $text=&mt($$option[1]);
$option=$$option[0];
} else {
- $text=$option;
+ $text=&mt($option);
$value='value="'.$option.'"';
}
- $result.=''."\n";
+ if ($useid) {
+ $result .= ' id="'.&html_element_name($name).'" ';
+ }
+ $result.=&element_change_detection().$onclick.' />'.$text.''."\n";
}
return $result;
}
sub text_arg {
- my ($description,$name,$token,$size) = @_;
+ my ($description,$name,$token,$size, $class) = @_;
my $result;
if (!defined $size) { $size=20; }
my $arg=$token->[2]{$name};
$result=&mt($description).' ';
- return ''.$result.'';
+ '" type="text" value="'.$arg.'" size="'.$size.'" ';
+ if (defined $class) {
+ $result .= 'class="' . $class . '" ';
+ }
+ $result .= &element_change_detection().'/>';
+ return ' '.$result.'';
}
sub select_arg {
@@ -903,7 +1055,7 @@ sub select_arg {
}
}
}
- $result.=''.&mt($description).' ';
@@ -954,16 +1106,16 @@ sub select_or_text_arg {
$description=&mt($description);
#
return (<
+
$description
+onchange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }" >
$optionlist
+onchange="$hiddenvalue=$typedinvalue;"
+onfocus="$selectedindex=$selecttypeinindex-1;" />
ENDSELECTORTYPE
@@ -1044,52 +1196,166 @@ sub deletecoorddata {
&Apache::lonnet::delenv('imagechoice.');
}
+#----------------------------------------------------- browse and search links
+sub browse_or_search {
+ my ($id,$mode,$titleid,$only,$crsonly,$usesearch) = @_;
+ my $output;
+ my ($cnum,$cdom) = &Apache::loncommon::crsauthor_url();
+ if ($cnum) {
+ my $form = 'lonhomework';
+ my ($element,$bretitleelement,$srchtitleelement);
+ $element = &get_element($id,$mode);
+ my %lt = &Apache::lonlocal::texthash (
+ uacf => 'Use a course file',
+ uanf => 'Use a new file',
+ impo => 'Import',
+ sear => 'Search',
+ sefi => 'Select File',
+ upfi => 'Upload File',
+ dire => 'Directory',
+ news => 'New sub-directory',
+ empd => 'No suitable resources found',
+ );
+ my ($importcrsres,$uploadfile,$allonly);
+ if ($only) {
+ $allonly = $only;
+ if ($crsonly) {
+ $allonly .= ','.$crsonly;
+ }
+ } elsif ($crsonly) {
+ $allonly = $crsonly;
+ }
+ my ($numdirs,$pickfile) =
+ &Apache::loncommon::import_crsauthor_form('coursepath_'.$element,'coursefile_'.$element,undef,$allonly,$element);
+ $importcrsres=(<
+
+
+
+
+CRSRES
+ my %subdirs;
+ my $toppath="/priv/$cdom/$cnum";
+ my $exclude = &Apache::lonnet::priv_exclude();
+ &Apache::lonnet::recursedirs(1,1,'',$exclude,'',0,$toppath,'',\%subdirs);
+ my $numcrsdirs = keys(%subdirs);
+ my $pickdir = $lt{'dire'}.''."\n".
+ ''."\n";
+ if ($numcrsdirs) {
+ foreach my $key (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
+ $pickdir .= ''."\n";
+ }
+ }
+ $pickdir .= ' ';
+ my $uploadfile =(<
+
+
+ $pickdir
+ $lt{'news'}?
+ No
+
+ Yes
+
+
+
+
+
+
+
+
+CRSUPL
+ if ($titleid) {
+ $bretitleelement=",'$only','','".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
+ $srchtitleelement=",'".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
+ } else {
+ $bretitleelement=",'$only'";
+ }
+ $output = ''.
+ &mt('Choose File').''.
+ '';
+
+ } else {
+ $output = &browse($id, $mode, $titleid, $only);
+ if ($usesearch) {
+ $output .= ' '.&search($id, $mode, $titleid);
+ }
+ }
+ return $output;
+}
+
#----------------------------------------------------- browse
sub browse {
# insert a link to call up the filesystem browser (lonindexer)
my ($id, $mode, $titleid, $only) = @_;
+ my %lt = &Apache::lonlocal::texthash (
+ se => 'Select',
+ );
my $form = 'lonhomework';
- my $element;
- if (! defined($mode) || $mode eq 'attribute') {
- $element = &escape("$id\_$Apache::lonxml::curdepth");
- } elsif ($mode eq 'textnode') { # for data between ...
- $element = &escape('homework_edit_'.
- $Apache::lonxml::curdepth);
- }
+ my $element = &get_element($id,$mode);
my $titleelement;
if ($titleid) {
$titleelement=",'$only','','".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
} else {
$titleelement=",'$only'";
}
- my $result = <<"ENDBUTTON";
-Select
+ return <<"ENDBUTTON";
+$lt{'se'}
ENDBUTTON
- return $result;
}
-#----------------------------------------------------- browse
+#----------------------------------------------------- search
sub search {
# insert a link to call up the filesystem browser (lonindexer)
my ($id, $mode, $titleid) = @_;
my $form = 'lonhomework';
- my $element;
- if (! defined($mode) || $mode eq 'attribute') {
- $element = &escape("$id\_$Apache::lonxml::curdepth");
- } elsif ($mode eq 'textnode') { # for data between ...
- $element = &escape('homework_edit_'.
- $Apache::lonxml::curdepth);
- }
+ my $element = &get_element($id,$mode);
my $titleelement;
if ($titleid) {
$titleelement=",'".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
}
+ my $linktext = &mt('Search');
my $result = <<"ENDBUTTON";
-Search
+$linktext
ENDBUTTON
return $result;
}
+sub get_element {
+ my ($id,$mode) = @_;
+ my $element;
+ if (! defined($mode) || $mode eq 'attribute') {
+ $element = &escape("$id\_$Apache::lonxml::curdepth");
+ } elsif ($mode eq 'textnode') { # for data between ...
+ $element = &escape('homework_edit_'.
+ $Apache::lonxml::curdepth);
+ }
+ return $element;
+}
1;
__END__
|
|