--- loncom/interface/lonhelper.pm 2005/04/07 21:36:22 1.101 +++ loncom/interface/lonhelper.pm 2005/07/07 04:12:01 1.105 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # .helper XML handler to implement the LON-CAPA helper # -# $Id: lonhelper.pm,v 1.101 2005/04/07 21:36:22 albertel Exp $ +# $Id: lonhelper.pm,v 1.105 2005/07/07 04:12:01 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2955,6 +2955,7 @@ be able to call methods on it. =cut use Apache::lonlocal; +use Apache::lonnet; BEGIN { &Apache::lonhelper::register('Apache::lonhelper::general', @@ -3182,7 +3183,7 @@ sub render { my $targetURL = ''; my $finish=&mt('Finish'); if ($self->{'restartCourse'}) { - my $actionURL = '/adm/roles'; + $actionURL = '/adm/roles'; $targetURL = '/adm/menu'; if ($env{'course.'.$env{'request.course.id'}.'.url'}=~/^uploaded/) { $targetURL = '/adm/coursedocs'; @@ -3225,6 +3226,7 @@ no strict; @ISA = ('Apache::lonhelper::element'); use strict; use Apache::lonlocal; +use Apache::lonnet; BEGIN { &Apache::lonhelper::register('Apache::lonhelper::parmwizfinal', @@ -3277,7 +3279,13 @@ sub render { # Print the granularity, depending on the action if ($vars->{GRANULARITY} eq 'whole_course') { $resourceString .= '
  • '.&mt('for all resources in the course').'
  • '; - $level = 9; # general course, see lonparmset.pm perldoc + if ($vars->{TARGETS} eq 'course') { + $level = 11; # general course, see lonparmset.pm perldoc + } elsif ($vars->{TARGETS} eq 'section') { + $level = 6; + } else { + $level = 3; + } $affectedResourceId = "0.0"; $symb = 'a'; $paramlevel = 'general'; @@ -3287,7 +3295,13 @@ sub render { my $title = $res->compTitle(); $symb = $res->symb(); $resourceString .= '
  • '.&mt('for the map named [_1]',"$title").'
  • '; - $level = 8; + if ($vars->{TARGETS} eq 'course') { + $level = 10; # general course, see lonparmset.pm perldoc + } elsif ($vars->{TARGETS} eq 'section') { + $level = 5; + } else { + $level = 2; + } $affectedResourceId = $vars->{RESOURCE_ID}; $paramlevel = 'map'; } else { @@ -3298,22 +3312,35 @@ sub render { $symb = $res->symb(); my $title = $res->compTitle(); $resourceString .= '
  • '.&mt('for the resource named [_1] part [_2]',"$title","$part").'
  • '; - $level = 7; + if ($vars->{TARGETS} eq 'course') { + $level = 7; # general course, see lonparmset.pm perldoc + } elsif ($vars->{TARGETS} eq 'section') { + $level = 4; + } else { + $level = 1; + } $affectedResourceId = $vars->{RESOURCE_ID}; $paramlevel = 'full'; } - my $result = "
    \n"; + my $result = "\n"; + $result .= "\n"; + $result .= "\n"; + if ($vars->{ACTION_TYPE} eq 'tries') { + $result .= "\n"; + } else { + $result .= "&\"") . "' />\n"; + } if ($vars->{GRANULARITY} eq 'resource') { $result .= "&\"") . "' />\n"; - $result .= "&\"") . "' />\n"; - my $part = $vars->{RESOURCE_ID_part}; - if ($part eq 'All Parts' || !$part) { $part=0; } - $result .= "&\"") . "' />\n"; } + my $part = $vars->{RESOURCE_ID_part}; + if ($part eq 'All Parts' || !$part) { $part=0; } + $result .= "&\"") . "' />\n"; + $result .= '

    '.&mt('Confirm that this information is correct, then click "Finish Helper" to complete setting the parameter.').'