--- loncom/homework/edit.pm 2013/12/03 17:47:30 1.151
+++ loncom/homework/edit.pm 2017/10/04 13:00:41 1.153.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# edit mode helpers
#
-# $Id: edit.pm,v 1.151 2013/12/03 17:47:30 bisitz Exp $
+# $Id: edit.pm,v 1.153.2.1 2017/10/04 13:00:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -134,6 +134,7 @@ package Apache::edit;
use strict;
use Apache::lonnet;
+use Apache::loncommon;
use HTML::Entities();
use Apache::lonlocal;
use lib '/home/httpd/lib/perl/';
@@ -164,12 +165,9 @@ sub tag_start {
$description=&mt(&Apache::lonxml::description($token));
if (!$description) { $description="<$tag>"; }
}
- $result.= &start_table($token)."
$description |
- ".&mt('Delete?').' '.
- &deletelist($target,$token)
- ." |
- ".
- &insertlist($target,$token);
+ $result.= &start_table($token)." |
".&Apache::loncommon::insert_folding_button().
+ " $description | ".&mt('Delete?')." ".&deletelist($target,$token).
+ " | ".&insertlist($target,$token);
# | ".
# &movebuttons($target,$token).
# " |
\n";
@@ -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 ' |
'; }
@@ -788,14 +789,59 @@ 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) = @_;
- return ' onclick="is_submit=true;'.$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 {
my ($data)=@_;
@@ -941,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};
@@ -964,7 +1010,10 @@ sub checked_arg {
last;
}
}
- $result.=&element_change_detection().' />'.$text.''."\n";
+ if ($useid) {
+ $result .= ' id="'.&html_element_name($name).'" ';
+ }
+ $result.=&element_change_detection().$onclick.' />'.$text.''."\n";
}
return $result;
}