--- loncom/homework/randomlabel.pm 2007/05/10 10:46:51 1.87
+++ loncom/homework/randomlabel.pm 2008/11/18 19:14:28 1.92
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.87 2007/05/10 10:46:51 foxr Exp $
+# $Id: randomlabel.pm,v 1.92 2008/11/18 19:14:28 jms Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,6 +53,7 @@
# (32,65) : $GroupTwo[1] = "TEXT-1"
# (21,54) : $GroupTwo[2] = "TEXT-2"
# ===========================================
+
package Apache::randomlabel;
use Apache::lonnet;
use strict;
@@ -61,7 +62,6 @@ use Apache::File();
use Apache::Constants qw(:common :http);
use Image::Magick;
use Apache::lonplot;
-use lib '/home/httpd/lib/perl/';
use LONCAPA;
@@ -147,12 +147,13 @@ sub start_randomlabel {
} elsif ($target eq 'tex' && defined($bgimg)) {
$result.=&make_eps_image($bgimg,$parstack,$safeeval);
} elsif ($target eq 'edit') {
+ my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
$result.=&Apache::edit::tag_start($target,$token);
$Apache::edit::bgimgsrc=
&Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
$Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth;
$result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
- $result.=&Apache::edit::browse('bgimg').' ';
+ $result.=&Apache::edit::browse('bgimg',undef,undef,$only).' ';
$result.=&Apache::edit::search('bgimg').'
'.
&Apache::edit::text_arg('Width(pixel):' ,'width' ,$token,6).
&Apache::edit::text_arg('Height(pixel):','height' ,$token,6).
@@ -164,7 +165,6 @@ sub start_randomlabel {
'height','texwidth');
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
}
}
return $result;
@@ -179,7 +179,7 @@ sub end_randomlabel {
$count = $Apache::randomlabel::obj_cnt;
if( $count != 0) { $args{"cgi.$cgi_id.OBJCOUNT"}=$count; }
$result.='
'."\n";
- &Apache::lonnet::appenv(%args);
+ &Apache::lonnet::appenv(\%args);
} elsif ($target eq 'tex') {
$result='\end{picture}\\\\';
$result.= ' \vskip -'.$height_param.' mm } \\\\ ';
@@ -354,7 +354,6 @@ sub start_labelgroup {
'TeXsize');
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
}
}
return $result;
@@ -540,7 +539,6 @@ sub start_location {
$safeeval,'x','y','value');
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
}
}
$Apache::lonxml::debug = 0;
@@ -555,6 +553,14 @@ sub end_location {
}
#
+sub insert_label {
+ my ($after) = @_;
+ my $depth = scalar(@Apache::lonxml::depthcounter);
+ $depth-- if ($after);
+ my $inset = "\t"x$depth;
+ return "\n$inset";
+}
+
sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';