loncom/interface/lonhelper.pm - diff

Return to lonhelper.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhelper.pm between versions 1.166.2.1 and 1.190

version 1.166.2.1, 2008/12/13 04:36:28	version 1.190, 2012/12/30 16:05:16
Line 188 use Apache::lonlocal;	Line 188 use Apache::lonlocal;
use Apache::lonnet;	use Apache::lonnet;
use Apache::longroup;	use Apache::longroup;
use Apache::lonselstudent;	use Apache::lonselstudent;


use LONCAPA;	use LONCAPA;

# Register all the tags with the helper, so the helper can	# Register all the tags with the helper, so the helper can
Line 259 sub real_handler {	Line 261 sub real_handler {
my $uri = shift;	my $uri = shift;
if (!defined($uri)) { $uri = $r->uri(); }	if (!defined($uri)) { $uri = $r->uri(); }
$env{'request.uri'} = $uri;	$env{'request.uri'} = $uri;
my $filename = '/home/httpd/html' . $uri;	my $filename = $r->dir_config('lonDocRoot').$uri;
my $fh = Apache::File->new($filename);	my $fh = Apache::File->new($filename);
my $file;	my $file;
read $fh, $file, 100000000;	read $fh, $file, 100000000;
Line 529 sub process {	Line 531 sub process {
# Phase 1: Post processing for state of previous screen (which is actually	# Phase 1: Post processing for state of previous screen (which is actually
# the "current state" in terms of the helper variables), if it wasn't the	# the "current state" in terms of the helper variables), if it wasn't the
# beginning state.	# beginning state.
if ($self->{STATE} ne "START" \|\| $env{"form.SUBMIT"} eq &mt("Next ->")) {	if ($self->{STATE} ne "START" \|\| $env{"form.SUBMIT"} eq &mt("Next")) {
my $prevState = $self->{STATES}{$self->{STATE}};	my $prevState = $self->{STATES}{$self->{STATE}};
$prevState->postprocess();	$prevState->postprocess();
}	}
Line 569 sub process {	Line 571 sub process {
# 4: Render the current state to the screen as an HTML page.	# 4: Render the current state to the screen as an HTML page.
sub display {	sub display {
my $self = shift;	my $self = shift;
	my $footer = shift;
my $state = $self->{STATES}{$self->{STATE}};	my $state = $self->{STATES}{$self->{STATE}};

my $result = "";	my $result = "";
Line 587 sub display {	Line 589 sub display {
&Apache::loncommon::browser_and_searcher_javascript().	&Apache::loncommon::browser_and_searcher_javascript().
"\n".'</script>';	"\n".'</script>';

	# Breadcrumbs
	my $brcrum = [{'href' => '',
	'text' => 'Helper'}];
	# FIXME: Dynamically add context sensitive breadcrumbs
	# depending on the caller,
	# e.g. printing, parametrization, etc.
	# FIXME: Add breadcrumbs to reflect current helper state

$result .= &Apache::loncommon::start_page($self->{TITLE},	$result .= &Apache::loncommon::start_page($self->{TITLE},
$browser_searcher_js);	$browser_searcher_js,
	{'bread_crumbs' => $brcrum,});
my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');	my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
	my $next = HTML::Entities::encode(&mt("Next"), '<>&"');
# FIXME: This should be parameterized, not concatenated - Jeremy	# FIXME: This should be parameterized, not concatenated - Jeremy


if (!$state->overrideForm()) { $result.="<form name='helpform' method='POST'>"; }	if (!$state->overrideForm()) { $result.='<form name="helpform" method="post" action="">'; }
if ($stateHelp) {	if ($stateHelp) {
$stateHelp = &Apache::loncommon::help_open_topic($stateHelp);	$stateHelp = &Apache::loncommon::help_open_topic($stateHelp);
}
$result .= <<HEADER;
<table border="0" width='100%'><tr><td>
<h2><i>$stateTitle</i>$stateHelp</h2>
HEADER

$result .= "<table cellpadding='10' width='100%'><tr><td rowspan='2' valign='top'>";

if (!$state->overrideForm()) {
$result .= $self->_saveVars();
}	}
$result .= $state->render();

$result .= "</td><td valign='top' align='right'>";

# Warning: Copy and pasted from below, because it's too much trouble to	# Prepare buttons
# turn this into a subroutine	my $buttons;
if (!$state->overrideForm()) {	if (!$state->overrideForm()) {
if ($self->{STATE} ne $self->{START_STATE}) {	if ($self->{STATE} ne $self->{START_STATE}) {
#$result .= '<input name="SUBMIT" type="submit" value="<- Previous" />  ';	#$result .= '<input name="SUBMIT" type="submit" value="<- Previous" />  ';
}	}
	$buttons = '<p>'; # '<fieldset>';
if ($self->{DONE}) {	if ($self->{DONE}) {
my $returnPage = $self->{RETURN_PAGE};	my $returnPage = $self->{RETURN_PAGE};
$result .= "<a href=\"$returnPage\">" . &mt("End Helper") . "</a>";	$buttons .= '<a href="'.$returnPage.'">'.&mt('End Helper').'</a>';
}	}
else {	else {
$result .= '<span class="LC_nobreak"><input name="back" type="button" ';	$buttons .= '<span class="LC_nobreak">'
$result .= 'value="' . $previous . '" onclick="history.go(-1)" /> ';	.'<input name="back" type="button" '
$result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></span>';	.'value="'.$previous.'" onclick="history.go(-1)" /> '
	.'<input name="SUBMIT" type="submit" value="'.$next.'" />'
	.'</span>';
}	}
	$buttons .= '</p>'; # '</fieldset>';
}	}

$result .= "</td></tr><tr><td valign='bottom' align='right'>";

# Warning: Copy and pasted from above, because it's too much trouble to
# turn this into a subroutine	$result .= '<h2>'.$stateTitle.$stateHelp.'</h2>';

	# $result .= '<div>';

	# Top buttons
	$result .= $buttons;

	# Main content of current helper screen
if (!$state->overrideForm()) {	if (!$state->overrideForm()) {
if ($self->{STATE} ne $self->{START_STATE}) {	$result .= $self->_saveVars();
#$result .= '<input name="SUBMIT" type="submit" value="<- Previous" />  ';
}
if ($self->{DONE}) {
my $returnPage = $self->{RETURN_PAGE};
$result .= "<a href=\"$returnPage\">" . &mt('End Helper') . "</a>";
}
else {
$result .= '<span class="LC_nobreak"><input name="back" type="button" ';
$result .= 'value="' . $previous . '" onclick="history.go(-1)" /> ';
$result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></span>';
}
}	}
	$result .= $state->render();

	# Bottom buttons
	$result .= $buttons;


#foreach my $key (keys %{$self->{VARS}}) {	#foreach my $key (keys %{$self->{VARS}}) {
# $result .= "\|$key\| -> " . $self->{VARS}->{$key} . "<br />";	# $result .= "\|$key\| -> " . $self->{VARS}->{$key} . "<br />";
#}	#}

$result .= "</td></tr></table>";	# $result .= '</div>';

$result .= <<FOOTER;	$result .= <<FOOTER;
</td>
</tr>
</table>
</form>	</form>
FOOTER	FOOTER

$result .= &Apache::loncommon::end_page();	$result .= $footer.&Apache::loncommon::end_page();
# Handle writing out the vars to the file	# Handle writing out the vars to the file
my $file = Apache::File->new('>'.$self->{FILENAME});	my $file = Apache::File->new('>'.$self->{FILENAME});
print $file $self->_varsInFile();	print $file $self->_varsInFile();
Line 1477 BUTTONS	Line 1476 BUTTONS
HTML::Entities::encode($choice->[1],"<>&\"'")	HTML::Entities::encode($choice->[1],"<>&\"'")
. "'";	. "'";
if ($checkedChoices{$choice->[1]}) {	if ($checkedChoices{$choice->[1]}) {
$result .= " checked='checked' ";	$result .= " checked='checked'";
}	}
$result .= qq{id="id$id"};	$result .= qq{ id="id$id"};
my $choiceLabel = $choice->[0];	my $choiceLabel = $choice->[0];
if ($choice->[3]) { # if we need to evaluate this choice	if ($choice->[3]) { # if we need to evaluate this choice
$choiceLabel = "sub { my $helper = shift; my $state = shift;" .	$choiceLabel = "sub { my $helper = shift; my $state = shift;" .
Line 1487 BUTTONS	Line 1486 BUTTONS
$choiceLabel = eval($choiceLabel);	$choiceLabel = eval($choiceLabel);
$choiceLabel = &$choiceLabel($helper, $self);	$choiceLabel = &$choiceLabel($helper, $self);
}	}
$result .= "/></td><td> ".qq{<label for="id$id">}.	$result .= " /></td><td> ".qq{<label for="id$id">}.
$choiceLabel. "</label></td>";	$choiceLabel. "</label></td>";
if ($choice->[4]) {	if ($choice->[4]) {
$result .='<td><input type="text" size="5" name="'	$result .='<td><input type="text" size="5" name="'
Line 1508 sub postprocess {	Line 1507 sub postprocess {
my $self = shift;	my $self = shift;
my $chosenValue = $env{'form.' . $self->{'variable'} . '_forminput'};	my $chosenValue = $env{'form.' . $self->{'variable'} . '_forminput'};


if (!defined($chosenValue) && !$self->{'allowempty'}) {	if (!defined($chosenValue) && !$self->{'allowempty'}) {
$self->{ERROR_MSG} =	$self->{ERROR_MSG} =
&mt("You must choose one or more choices to continue.");	&mt("You must choose one or more choices to continue.");
return 0;	return 0;
}	}



if (ref($chosenValue)) {	if (ref($chosenValue)) {
$helper->{VARS}->{$self->{'variable'}} = join('\|\|\|', @$chosenValue);	$helper->{VARS}->{$self->{'variable'}} = join('\|\|\|', @$chosenValue);
}	}
Line 1911 CHECK	Line 1913 CHECK
if ($anytime) {	if ($anytime) {
$result.=' checked="checked" '	$result.=' checked="checked" '
}	}
$result.="name='${var}anytime'/>".&mt('Any time').'</label>'	my $anytimetext = &mt('Any time');
	if (($var eq 'startreserve') \|\| ($var eq 'endreserve')) {
	$anytimetext = &mt('Any time before slot starts');
	} elsif (($var eq 'startunique') \|\| ($var eq 'endunique')) {
	$anytimetext = &mt('No restriction on uniqueness');
	}
	$result.="name='${var}anytime'/>".$anytimetext.'</label>'
}	}
return $result;	return $result;

Line 2064 the toplevel default.sequence in the res	Line 2072 the toplevel default.sequence in the res
evaluated with "sub { my $helper = shift; my $state = shift;" and	evaluated with "sub { my $helper = shift; my $state = shift;" and
"}", with the return value used as the mapurl.	"}", with the return value used as the mapurl.

	=item * <option />: Allows you to add optional elements to the
	resource chooser currently these can be a checkbox, or a text entry
	or hidden (see the 'type' attribute below).
	the following attributes are supported by this tag:

	=over 4

	=item * type=control-type : determines the type of control displayed.
	This can be one of the following types: 'checkbox' provides a true/false
	checkbox. 'text' provides a text entry control. 'hidden' provides a
	hidden form element that returns the name of the resource for each
	element of the text box.

	=item * text=header-text : provides column header text for the option.

	=item * variable=helpervar : provides a helper variable to contain the
	value of the input control for each resource. In general, the result
	will be a set of values separated by \|\|\| for the checkbox the value between
	the \|\|\|'s will either be empty, if the box is not checked, or the resource
	name if checked. For the text entry, the values will be the text in the
	text box. This could be empty. Hidden elements unconditionally provide
	the resource name for each row of the chooser and allow you to therefore
	correlate text entries to their resources.
	The helper variable can be initialized by the user code to pre-load values
	into the controls:

	=over 4


	=item * Preloading checkboxes : Set the helper variable to the value you
	would have gotten from the control if it had been manually set as desired.

	=item * Preloading text entries : Set the helper variable to triple pipe
	separated values where each value is of the form resource-name=value

	=item * Preloading hidden fields : These cannot be pre-loaded and will always
	be pipe separated resource names.

	=back


	=back

=back	=back

=cut	=cut
Line 2193 sub start_option {	Line 2244 sub start_option {
if (!defined($paramHash->{OPTION_TEXTS})) {	if (!defined($paramHash->{OPTION_TEXTS})) {
$paramHash->{OPTION_TEXTS} = [ ];	$paramHash->{OPTION_TEXTS} = [ ];
$paramHash->{OPTION_VARS} = [ ];	$paramHash->{OPTION_VARS} = [ ];
	$paramHash->{OPTION_TYPES} = [ ];

}	}
	# We can have an attribute: type which can have the
	# values: "checkbox" or "text" which defaults to
	# checkbox allowing us to change the type of input
	# for the option:
	#
	my $input_widget_type = 'checkbox';
	if(defined($token->[2]{'type'})) {
	my $widget_type = $token->[2]{'type'};
	if ($widget_type eq 'text') { # only accept legal alternatives
	$input_widget_type = $widget_type; # Illegals are checks.
	} elsif ($widget_type eq 'hidden') {
	$input_widget_type = $widget_type;
	}
	}

# OPTION_TEXTS is a list of the text attribute	# OPTION_TEXTS is a list of the text attribute
# values used to create column headings.	# values used to create column headings.
# OPTION_VARS is a list of the variable names, used to create the checkbox	# OPTION_VARS is a list of the variable names, used to create the checkbox
# inputs.	# inputs.
	# OPTION_TYPES is a list of the option types:
	#
# We're ok with empty elements. as place holders	# We're ok with empty elements. as place holders
# Although the 'variable' element should really exist.	# Although the 'variable' element should really exist.
#	#


my $option_texts = $paramHash->{OPTION_TEXTS};	my $option_texts = $paramHash->{OPTION_TEXTS};
my $option_vars = $paramHash->{OPTION_VARS};	my $option_vars = $paramHash->{OPTION_VARS};
	my $option_types = $paramHash->{OPTION_TYPES};
push(@$option_texts, $token->[2]{'text'});	push(@$option_texts, $token->[2]{'text'});
push(@$option_vars, $token->[2]{'variable'});	push(@$option_vars, $token->[2]{'variable'});
	push(@$option_types, $input_widget_type);


# Need to create and declare the option variables as well to make them	# Need to create and declare the option variables as well to make them
# persistent.	# persistent.
Line 2282 BUTTONS	Line 2355 BUTTONS
my $multichoice = $self->{'multichoice'};	my $multichoice = $self->{'multichoice'};
my $option_vars = $self->{OPTION_VARS};	my $option_vars = $self->{OPTION_VARS};
my $option_texts = $self->{OPTION_TEXTS};	my $option_texts = $self->{OPTION_TEXTS};
	my $option_types = $self->{OPTION_TYPES};
my $addparts = $self->{'addparts'};	my $addparts = $self->{'addparts'};
my $headings_done = 0;	my $headings_done = 0;

Line 2340 BUTTONS	Line 2414 BUTTONS
my $resource_name =	my $resource_name =
HTML::Entities::encode($raw_name,"<>&\"'");	HTML::Entities::encode($raw_name,"<>&\"'");
if($option_vars) {	if($option_vars) {
	my $option_num = 0;
foreach my $option_var (@$option_vars) {	foreach my $option_var (@$option_vars) {
	my $option_type = $option_types->[$option_num];
	$option_num++;
my $var_value = "\\|\\|\\|" . $helper->{VARS}->{$option_var} .	my $var_value = "\\|\\|\\|" . $helper->{VARS}->{$option_var} .
"\\|\\|\\|";	"\\|\\|\\|";
my $checked ="";	my $checked ="";
if($var_value =~ /\Q\|\|\|$raw_name\|\|\|\E/) {	if($var_value =~ /\Q\|\|\|$raw_name\|\|\|\E/) {
$checked = "checked='checked'";	$checked = "checked='checked'";
}	}
$col .=	if ($option_type eq 'text') {
"<td align='center'><input type='checkbox' name ='$option_var".	#
"_forminput' value='".	# For text's the variable value is a \|\|\| separated set of
$resource_name . "' $checked /> </td>";	# resource_name=value
	#
	my @values = split(/\\|\\|\\|/, $helper->{VARS}->{$option_var});

	# Normal practice would be to toss this in a hash but
	# the only thing that saves is the compare in the loop
	# below and for all but one case we'll break out of the loop
	# before it completes.

	my $text_value = ''; # In case there's no match.
	foreach my $value (@values) {
	my ($res, $skip) = split(/=/, $value);
	if($res eq $resource_name) {
	$text_value = $skip;
	last;
	}
	}
	# TODO: add an attribute to <option> that allows the
	# programmer to set the width of the tex entry box.

	$col .=
	"<td align='center'><input type='text' name ='$option_var".
	"_forminput' value='".$text_value."' size='5' /> </td>";
	} elsif ($option_type eq 'hidden') {
	$col .= "<td align='center'><input type='hidden' name ='$option_var".
	"_forminput' value='".
	$resource_name . "'/> </td>";
	} else {
	$col .=
	"<td align='center'><input type=$option_type name ='$option_var".
	"_forminput' value='".
	$resource_name . "' $checked /> </td>";
	}
}	}
}	}

Line 2431 RADIO	Line 2540 RADIO
'closeAllPages' => $self->{'closeallpages'},	'closeAllPages' => $self->{'closeallpages'},
'suppressEmptySequences' => $self->{'suppressEmptySequences'},	'suppressEmptySequences' => $self->{'suppressEmptySequences'},
'include_top_level_map' => $self->{'include_top_level_map'},	'include_top_level_map' => $self->{'include_top_level_map'},
'iterator_map' => $mapUrl }	'iterator_map' => $mapUrl,
	'map_no_edit_link' => 1, }
);	);

$result .= $buttons;	$result .= $buttons;
Line 2446 sub postprocess {	Line 2556 sub postprocess {
$self->{ERROR_MSG} = 'You must choose at least one resource to continue.';	$self->{ERROR_MSG} = 'You must choose at least one resource to continue.';
return 0;	return 0;
}	}
	# For each of the attached options. If it's env var is undefined, set it to
	# an empty string instead.. an undef'd env var means no choices selected.
	#

	my $option_vars = $self->{OPTION_VARS};
	if ($option_vars) {
	foreach my $var (@$option_vars) {
	my $env_name = "form.".$var."_forminput";
	if (!defined($env{$env_name})) {
	$env{$env_name} = '';
	$helper->{VARS}->{$var} = '';
	}
	}
	}


if (defined($self->{NEXTSTATE})) {	if (defined($self->{NEXTSTATE})) {
$helper->changeState($self->{NEXTSTATE});	$helper->changeState($self->{NEXTSTATE});
Line 2853 BUTTONS	Line 2978 BUTTONS
}	}

# Get the list of files in this directory.	# Get the list of files in this directory.
my @fileList;	my (@fileList,$listref,$listerror);

# If the subdirectory is in local CSTR space	# If the subdirectory is in local CSTR space
my $metadir;	my $metadir;
if ($subdir =~ m\|/home/([^/]+)/public_html/(.*)\|) {	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my ($user,$domain)=	if ($subdir =~ m{^(?:\Q$londocroot\E)/priv/[^/]+/[^/]+/(.)$}) {
&Apache::loncacc::constructaccess($subdir,	my $innerpath=$1;
$Apache::lonnet::perlvar{'lonDefDomain'});	unless ($subdir=~m{^\Q$londocroot\E}) {
$metadir='/res/'.$domain.'/'.$user.'/'.$2;	$subdir=$londocroot.$subdir;
@fileList = &Apache::lonnet::dirlist($subdir,$domain,$user,undef,undef,'/');	}
} elsif ($subdir =~ m\|^~([^/]+)/(.*)$\|) {
$subdir='/home/'.$1.'/public_html/'.$2;
my ($user,$domain)=	my ($user,$domain)=
&Apache::loncacc::constructaccess($subdir,	&Apache::lonnet::constructaccess($subdir);
$Apache::lonnet::perlvar{'lonDefDomain'});	$metadir='/res/'.$domain.'/'.$user.'/'.$innerpath;
$metadir='/res/'.$domain.'/'.$user.'/'.$2;	($listref,$listerror) =
@fileList = &Apache::lonnet::dirlist($subdir,$domain,$user,undef,undef,'/');	&Apache::lonnet::dirlist($subdir,$domain,$user,undef,undef,'/');
} else {	} else {
# local library server resource space	# local library server resource space
@fileList = &Apache::lonnet::dirlist($subdir,$env{'user.domain'},$env{'user.name'},undef,undef,'/');	($listref,$listerror) =
	&Apache::lonnet::dirlist($subdir,$env{'user.domain'},$env{'user.name'},undef,undef,'/');
}	}

# Sort the fileList into order	# Sort the fileList into order
@fileList = sort {lc($a) cmp lc($b)} @fileList;	if (ref($listref) eq 'ARRAY') {
	@fileList = sort {lc($a) cmp lc($b)} @{$listref};
	}

$result .= $buttons;	$result .= $buttons;

Line 2971 sub fileState {	Line 3097 sub fileState {
}	}
my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};	my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my $subdirpart = $constructionSpaceDir;	my $subdirpart = $constructionSpaceDir;
$subdirpart =~ s/^\/home\/$uname\/public_html//;	$subdirpart =~ s{^\Q$docroot/priv/$udom/$uname\E}{};
my $resdir = $docroot . '/res/' . $udom . '/' . $uname .	my $resdir = $docroot . '/res/' . $udom . '/' . $uname .
$subdirpart;	$subdirpart;

Line 3171 package Apache::lonhelper::string;	Line 3297 package Apache::lonhelper::string;
string elements provide a string entry field for the user. string elements	string elements provide a string entry field for the user. string elements
take the usual 'variable' and 'nextstate' parameters. string elements	take the usual 'variable' and 'nextstate' parameters. string elements
also pass through 'maxlength' and 'size' attributes to the input tag.	also pass through 'maxlength' and 'size' attributes to the input tag.
	Since you could have multiple strings in a helper state, each with its own
	validator, all but the last string should have
	noproceed='1' so that _all_ validators are evaluated before the next
	state can be reached.

string honors the defaultvalue tag, if given.	string honors the defaultvalue tag, if given.

Line 3190 BEGIN {	Line 3320 BEGIN {

sub new {	sub new {
my $ref = Apache::lonhelper::element->new();	my $ref = Apache::lonhelper::element->new();
	$ref->{'PROCEED'} = 1; # By default postprocess goes to next state.
bless($ref);	bless($ref);
}	}

Line 3206 sub start_string {	Line 3337 sub start_string {
$paramHash->{'nextstate'} = $token->[2]{'nextstate'};	$paramHash->{'nextstate'} = $token->[2]{'nextstate'};
$paramHash->{'maxlength'} = $token->[2]{'maxlength'};	$paramHash->{'maxlength'} = $token->[2]{'maxlength'};
$paramHash->{'size'} = $token->[2]{'size'};	$paramHash->{'size'} = $token->[2]{'size'};

return '';	return '';
}	}

sub end_string {	sub end_string {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;


if ($target ne 'helper') {	if ($target ne 'helper') {
return '';	return '';
}	}
Apache::lonhelper::string->new();	my $state = Apache::lonhelper::string->new();


	if(&Apache::lonxml::get_param('noproceed', $parstack, $safeeval, undef, 1)) {
	$state->noproceed();
	}



return '';	return '';
}	}

	sub noproceed() {
	my $self = shift;
	$self->{PROCEED} = 0;
	}

sub render {	sub render {
my $self = shift;	my $self = shift;
my $result = '';	my $result = '';
Line 3228 sub render {	Line 3372 sub render {
$result .= '<p><font color="#FF0000">' . $self->{ERROR_MSG} . '</font></p>';	$result .= '<p><font color="#FF0000">' . $self->{ERROR_MSG} . '</font></p>';
}	}

$result .= '<input type="string" name="' . $self->{'variable'} . '_forminput"';	$result .= '<input type="text" name="' . $self->{'variable'} . '_forminput"';

if (defined($self->{'size'})) {	if (defined($self->{'size'})) {
$result .= ' size="' . $self->{'size'} . '"';	$result .= ' size="' . $self->{'size'} . '"';
Line 3263 sub postprocess {	Line 3407 sub postprocess {
}	}
}	}

if (defined($self->{'nextstate'})) {	if (defined($self->{'nextstate'}) && $self->{PROCEED}) {
$helper->changeState($self->{'nextstate'});	$helper->changeState($self->{'nextstate'});
}	}

Line 3421 snippets and collecting the results. Fin	Line 3565 snippets and collecting the results. Fin
helper, going to a provided page.	helper, going to a provided page.

If the parameter "restartCourse" is true, this will override the buttons and	If the parameter "restartCourse" is true, this will override the buttons and
will make a "Finish Helper" button that will re-initialize the course for them,	will make a Save button (Finish Helper) that will re-initialize the course for them,
which is useful for the Course Initialization helper so the users never see	which is useful for the Course Initialization helper so the users never see
the old values taking effect.	the old values taking effect.

Line 3528 sub render {	Line 3672 sub render {

my $actionURL = $self->{EXIT_PAGE};	my $actionURL = $self->{EXIT_PAGE};
my $targetURL = '';	my $targetURL = '';
my $finish=&mt('Finish');	my $finish=&mt('Save');
if ($self->{'restartCourse'}) {	if ($self->{'restartCourse'}) {
$actionURL = '/adm/roles';	$actionURL = '/adm/roles';
$targetURL = '/adm/menu';	$targetURL = '/adm/menu';
Line 3540 sub render {	Line 3684 sub render {
if ($env{'course.'.$env{'request.course.id'}.'.clonedfrom'}) {	if ($env{'course.'.$env{'request.course.id'}.'.clonedfrom'}) {
$targetURL = '/adm/parmset?overview=1';	$targetURL = '/adm/parmset?overview=1';
}	}
my $finish=&mt('Finish Course Initialization');
}	}
my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');	my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');	my $next = HTML::Entities::encode(&mt("Next"), '<>&"');
my $target = " target='loncapaclient'";	$result .= "<p>\n" .
if (($env{'browser.interface'} eq 'textual') \|\|	"<form action='".$actionURL."' method='post' >\n" .
($env{'environment.remote'} eq 'off')) { $target=''; }
$result .= "<center>\n" .
"<form action='".$actionURL."' method='post' $target>\n" .
"<input type='button' onclick='history.go(-1)' value='$previous' />" .	"<input type='button' onclick='history.go(-1)' value='$previous' />" .
"<input type='hidden' name='orgurl' value='$targetURL' />" .	"<input type='hidden' name='orgurl' value='$targetURL' />" .
"<input type='hidden' name='selectrole' value='1' />\n" .	"<input type='hidden' name='selectrole' value='1' />\n" .
"<input type='hidden' name='" . $env{'request.role'} .	"<input type='hidden' name='" . $env{'request.role'} .
"' value='1' />\n<input type='submit' value='" . $finish . "' />\n" .	"' value='1' />\n<input type='submit' value='" . $finish . "' />\n" .
"</form></center>";	"</form></p>\n";

return $result;	return $result;
}	}
Line 3633 sub render {	Line 3773 sub render {

# Print the granularity, depending on the action	# Print the granularity, depending on the action
if ($vars->{GRANULARITY} eq 'whole_course') {	if ($vars->{GRANULARITY} eq 'whole_course') {
$resourceString .= '<li>'.&mt('for <b>all resources in the course</b>').'</li>';	$resourceString .= '<li>'.&mt('for [_1]all resources in the course[_2]','<b>','</b>').'</li>';
if ($vars->{TARGETS} eq 'course') {	if ($vars->{TARGETS} eq 'course') {
$level = 14; # general course, see lonparmset.pm perldoc	$level = 14; # general course, see lonparmset.pm perldoc
} elsif ($vars->{TARGETS} eq 'section') {	} elsif ($vars->{TARGETS} eq 'section') {
Line 3648 sub render {	Line 3788 sub render {
$paramlevel = 'general';	$paramlevel = 'general';
} elsif ($vars->{GRANULARITY} eq 'map') {	} elsif ($vars->{GRANULARITY} eq 'map') {
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});	if (defined($navmap)) {
my $title = $res->compTitle();	my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
$symb = $res->symb();	my $title = $res->compTitle();
$resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';	$symb = $res->symb();
	$resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
	} else {
	$resourceString .= '<li>'.&mt('for the map ID [_1] (name unavailable)','<b>'.$vars->{RESOURCE_ID}.'</b>').'</li>';
	&Apache::lonnet::logthis('Retrieval of map title failed in lonhelper.pm - could not create navmap object for course.');

	}
if ($vars->{TARGETS} eq 'course') {	if ($vars->{TARGETS} eq 'course') {
$level = 13; # general course, see lonparmset.pm perldoc	$level = 13; # general course, see lonparmset.pm perldoc
} elsif ($vars->{TARGETS} eq 'section') {	} elsif ($vars->{TARGETS} eq 'section') {
Line 3664 sub render {	Line 3810 sub render {
$affectedResourceId = $vars->{RESOURCE_ID};	$affectedResourceId = $vars->{RESOURCE_ID};
$paramlevel = 'map';	$paramlevel = 'map';
} else {	} else {
my $navmap = Apache::lonnavmaps::navmap->new();
my $res = $navmap->getById($vars->{RESOURCE_ID});
my $part = $vars->{RESOURCE_ID_part};	my $part = $vars->{RESOURCE_ID_part};
if ($part ne 'All Parts' && $part) { $parm_name=~s/^0/$part/; } else { $part=&mt('All Parts'); }	if ($part ne 'All Parts' && $part) { $parm_name=~s/^0/$part/; } else { $part=&mt('All Parts'); }
$symb = $res->symb();	my $navmap = Apache::lonnavmaps::navmap->new();
my $title = $res->compTitle();	if (defined($navmap)) {
$resourceString .= '<li>'.&mt('for the resource named [_1] part [_2]',"<b>$title</b>","<b>$part</b>").'</li>';	my $res = $navmap->getById($vars->{RESOURCE_ID});
	$symb = $res->symb();
	my $title = $res->compTitle();
	$resourceString .= '<li>'.&mt('for the resource named [_1], part [_2]',"<b>$title</b>","<b>$part</b>").'</li>';
	} else {
	$resourceString .= '<li>'.&mt('for the resource ID [_1] (name unavailable), part [_2]','<b>'.$vars->{RESOURCE_ID}.'</b>',"<b>$part</b>").'</li>';
	&Apache::lonnet::logthis('Retrieval of resource title failed in lonhelper.pm - could not create navmap object for course.');
	}
if ($vars->{TARGETS} eq 'course') {	if ($vars->{TARGETS} eq 'course') {
$level = 10; # general course, see lonparmset.pm perldoc	$level = 10; # general course, see lonparmset.pm perldoc
} elsif ($vars->{TARGETS} eq 'section') {	} elsif ($vars->{TARGETS} eq 'section') {
Line 3684 sub render {	Line 3835 sub render {
$paramlevel = 'full';	$paramlevel = 'full';
}	}

my $result = "<form name='helpform' method='POST' action='/adm/parmset#$affectedResourceId&$parm_name&$level'>\n";	my $result = "<form name='helpform' method='post' action='/adm/parmset#$affectedResourceId&$parm_name&$level'>\n";
$result .= "<input type='hidden' name='action' value='settable' />\n";	$result .= "<input type='hidden' name='action' value='settable' />\n";
$result .= "<input type='hidden' name='dis' value='helper' />\n";	$result .= "<input type='hidden' name='dis' value='helper' />\n";
$result .= "<input type='hidden' name='pscat' value='".	$result .= "<input type='hidden' name='pscat' value='".
Line 3701 sub render {	Line 3852 sub render {
$result .= "<input type='hidden' name='psprt' value='".	$result .= "<input type='hidden' name='psprt' value='".
HTML::Entities::encode($part,"'<>&\"") . "' />\n";	HTML::Entities::encode($part,"'<>&\"") . "' />\n";

$result .= '<p>'.&mt('Confirm that this information is correct, then click "Finish Helper" to complete setting the parameter.').'<ul>';	$result .= '<p class="LC_info">'
	.&mt('Confirm that this information is correct, then click "Save" to complete setting the parameter.')
	.'</p>'
	.'<ul>';

# Print the type of manipulation:	# Print the type of manipulation:
my $extra;	my $extra;
Line 3749 sub render {	Line 3903 sub render {

# Print targets	# Print targets
if ($vars->{TARGETS} eq 'course') {	if ($vars->{TARGETS} eq 'course') {
$result .= '<li>'.&mt('for <b>all students in course</b>').'</li>';	$result .= '<li>'.&mt('for [_1]all students in course[_2]','<b>','</b>').'</li>';
} elsif ($vars->{TARGETS} eq 'section') {	} elsif ($vars->{TARGETS} eq 'section') {
my $section = $vars->{SECTION_NAME};	my $section = $vars->{SECTION_NAME};
$result .= '<li>'.&mt('for section [_1]',"<b>$section</b>").'</li>';	$result .= '<li>'.&mt('for section [_1]',"<b>$section</b>").'</li>';
Line 3777 sub render {	Line 3931 sub render {
my $showdate = &Apache::lonlocal::locallocaltime($vars->{PARM_DATE});	my $showdate = &Apache::lonlocal::locallocaltime($vars->{PARM_DATE});
$result .= '<li>'.&mt('to [_1] ([_2])',"<b>".$showdate."</b>",Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE}))."</li>\n";	$result .= '<li>'.&mt('to [_1] ([_2])',"<b>".$showdate."</b>",Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE}))."</li>\n";
}	}

	$result .= '</ul>';

	# FIXME: Make previous button working
	# Found to be dysfunctional when used to change the selected student
	# my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
	my $buttons .= '<p><span class="LC_nobreak">'
	# .'<input name="back" type="button"'
	# .' value="'.$previous.'" onclick="history.go(-1)" />'
	.' <input type="submit" value="'.&mt('Save').'" />' # Finish Helper
	.'</span></p>'."\n";

# print pres_marker	# print pres_marker
$result .= "\n<input type='hidden' name='pres_marker'" .	$result .= "\n<input type='hidden' name='pres_marker'" .
" value='$affectedResourceId&$parm_name&$level' />\n";	" value='$affectedResourceId&$parm_name&$level' />\n";
Line 3787 sub render {	Line 3952 sub render {
$result .= "\n<input type='hidden' value='$symb' name='pssymb' />";	$result .= "\n<input type='hidden' value='$symb' name='pssymb' />";
$result .= "\n<input type='hidden' value='$paramlevel' name='parmlev' />";	$result .= "\n<input type='hidden' value='$paramlevel' name='parmlev' />";

$result .= "<br /><br /><center><input type='submit' value='".&mt('Finish Helper')."' /></center></form>\n";	$result .= $buttons;

return $result;	return $result;
}	}

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

Removed from v.1.166.2.1
changed lines
	Added in v.1.190