Diff for /loncom/homework/randomlabel.pm between versions 1.5 and 1.11

version 1.5, 2001/10/14 05:08:09 version 1.11, 2002/01/21 16:40:57
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # random labelling tool  # random labelling tool
   #
   # $Id$
   #
   # 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  # 7/20/2001 Isaac Tsai, initial syntax
 # 8/10/2001 Isaac Tsai,   # 8/10/2001 Isaac Tsai, 
 # 8/30/2001 Isaac Tsai,   # 8/30/2001 Isaac Tsai, 
Line 33 Line 58
 #  ===========================================  #  ===========================================
 package Apache::randomlabel;  package Apache::randomlabel;
 use strict;  use strict;
   use Apache::edit;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));    &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
 }  }
   
 sub start_randomlabel {  sub start_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
       '/res/adm/includes/GLabel.class';
   
   my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);    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 $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
   my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);    my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
   my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);    my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);
Line 64  sub start_randomlabel { Line 104  sub start_randomlabel {
       &Apache::edit::text_arg('Width(pixel):','width',$token,4).        &Apache::edit::text_arg('Width(pixel):','width',$token,4).
  &Apache::edit::text_arg('Height(pixel):','height',$token,4).   &Apache::edit::text_arg('Height(pixel):','height',$token,4).
   &Apache::edit::text_arg('TeXWidth(mm):','texwidth',$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') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
  'bgimg','width','height',   'bgimg','width','height',
Line 115  sub start_labelgroup { Line 155  sub start_labelgroup {
     $result.=&Apache::edit::tag_start($target,$token);      $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token).      $result.=&Apache::edit::text_arg('Name:','name',$token).
       &Apache::edit::select_arg('Type:','type',['text','image'],$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') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
  'name','type');   'name','type');
Line 239  sub start_location { Line 279  sub start_location {
     $result.=&Apache::edit::text_arg('X:','x',$token,4).      $result.=&Apache::edit::text_arg('X:','x',$token,4).
       &Apache::edit::text_arg('Y:','y',$token,4).        &Apache::edit::text_arg('Y:','y',$token,4).
  &Apache::edit::text_arg('Value:','value',$token).   &Apache::edit::text_arg('Value:','value',$token).
  '</td></tr><tr><td colspan="3">';    &Apache::edit::end_row();
     $result.=&Apache::edit::end_table;      $result.=&Apache::edit::end_table;
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
Line 270  sub start_label { Line 310  sub start_label {
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);      $result.=&Apache::edit::tag_start($target,$token);
     my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);      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::editfield('',$text,'',20,1).
  &Apache::edit::end_table();   &Apache::edit::end_table();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $text=$$parser[-1]->get_text("/label");      my $text=$$parser[-1]->get_text("/label");
     $result.=&Apache::edit::modifiedfield($token);      $result.='<label>'.&Apache::edit::modifiedfield($token);
   }    }
   return $result;    return $result;
 }  }

Removed from v.1.5  
changed lines
  Added in v.1.11


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>