--- loncom/homework/randomlabel.pm 2007/05/23 22:36:21 1.88
+++ loncom/homework/randomlabel.pm 2007/10/17 22:11:55 1.90
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.88 2007/05/23 22:36:21 albertel Exp $
+# $Id: randomlabel.pm,v 1.90 2007/10/17 22:11:55 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,7 +61,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 +146,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).
@@ -552,6 +552,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='';