--- loncom/homework/randomlabel.pm	2001/10/14 05:08:09	1.5
+++ loncom/homework/randomlabel.pm	2002/01/11 16:32:29	1.9
@@ -1,5 +1,30 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
+#
+# $Id: randomlabel.pm,v 1.9 2002/01/11 16:32:29 matthew Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 7/20/2001 Isaac Tsai, initial syntax
 # 8/10/2001 Isaac Tsai, 
 # 8/30/2001 Isaac Tsai, 
@@ -33,6 +58,7 @@
 #  ===========================================
 package Apache::randomlabel;
 use strict;
+use Apache::edit;
 
 sub BEGIN {
   &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
@@ -41,7 +67,21 @@ sub BEGIN {
 sub start_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
+  $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+    '/res/adm/includes/GLabel.class';
+
   my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
+
+  if ( $bgimg !~ /^http:/ ) {
+    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$bgimg;
+    $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
+    if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {
+      $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;
+    } elsif ($bgimg =~ m:^/home/.*/public_html:) {
+      $bgimg =~ s:^/home/(.*)/public_html:/~$1:;
+    }
+    $bgimg="http://".$ENV{'SERVER_NAME'}.$bgimg;
+  }
   my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
   my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
   my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);
@@ -64,7 +104,7 @@ sub start_randomlabel {
       &Apache::edit::text_arg('Width(pixel):','width',$token,4).
 	&Apache::edit::text_arg('Height(pixel):','height',$token,4).
 	  &Apache::edit::text_arg('TeXWidth(mm):','texwidth',$token,4).
-	    '</td></tr><tr><td colspan="3">';
+	     &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						 'bgimg','width','height',
@@ -115,7 +155,7 @@ sub start_labelgroup {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token).
       &Apache::edit::select_arg('Type:','type',['text','image'],$token).
-	'</td></tr><tr><td colspan="3">';
+	  &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						 'name','type');
@@ -239,7 +279,7 @@ sub start_location {
     $result.=&Apache::edit::text_arg('X:','x',$token,4).
       &Apache::edit::text_arg('Y:','y',$token,4).
 	&Apache::edit::text_arg('Value:','value',$token).
-	'</td></tr><tr><td colspan="3">';
+	  &Apache::edit::end_row();
     $result.=&Apache::edit::end_table;
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
@@ -270,7 +310,7 @@ sub start_label {
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
     my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
-    $result.='</td></tr><tr><td colspan="3">'.
+    $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row().
       &Apache::edit::editfield('',$text,'',20,1).
 	&Apache::edit::end_table();
   } elsif ($target eq 'modified') {